Skip to content

chore: renaming vars named k8sClient to kubernetsClient #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public class ConfiguredController<R extends CustomResource<?, ?>> implements Res
Closeable {
private final ResourceController<R> controller;
private final ControllerConfiguration<R> configuration;
private final KubernetesClient k8sClient;
private final KubernetesClient kubernetesClient;
private EventSourceManager eventSourceManager;

public ConfiguredController(ResourceController<R> controller,
ControllerConfiguration<R> configuration,
KubernetesClient k8sClient) {
KubernetesClient kubernetesClient) {
this.controller = controller;
this.configuration = configuration;
this.k8sClient = k8sClient;
this.kubernetesClient = kubernetesClient;
}

@Override
Expand Down Expand Up @@ -140,11 +140,11 @@ public ControllerConfiguration<R> getConfiguration() {
}

public KubernetesClient getClient() {
return k8sClient;
return kubernetesClient;
}

public MixedOperation<R, KubernetesResourceList<R>, Resource<R>> getCRClient() {
return k8sClient.resources(configuration.getCustomResourceClass());
return kubernetesClient.resources(configuration.getCustomResourceClass());
}

/**
Expand All @@ -164,7 +164,8 @@ public void start() throws OperatorException {
// check that the custom resource is known by the cluster if configured that way
final CustomResourceDefinition crd; // todo: check proper CRD spec version based on config
if (configuration.getConfigurationService().checkCRDAndValidateLocalModel()) {
crd = k8sClient.apiextensions().v1().customResourceDefinitions().withName(crdName).get();
crd =
kubernetesClient.apiextensions().v1().customResourceDefinitions().withName(crdName).get();
if (crd == null) {
throwMissingCRDException(crdName, specVersion, controllerName);
}
Expand Down