Skip to content

Updating kubernetes-client version #184

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.

Sign up for GitHub

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

Open
d-kononov wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updating kubernetes-client version #184

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d15096c
updating kubernetes-client version
d-kononov Sep 24, 2018
68ef79b
fixing TillerInstaller
d-kononov Sep 24, 2018
bb3e996
adding import for each api model
d-kononov Sep 24, 2018
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>3.1.8</version>
<version>4.0.4</version>
<type>jar</type>
</dependency>

Expand Down
35 changes: 10 additions & 25 deletions src/main/java/org/microbean/helm/TillerInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

import com.github.zafarkhaja.semver.Version;

import io.fabric8.kubernetes.api.model.*;

@fidget83 fidget83 Sep 24, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better not replace classes with pounds...

@d-kononov d-kononov Sep 24, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.HttpClientAware;
import io.fabric8.kubernetes.client.KubernetesClient;
Expand All @@ -46,28 +47,9 @@
import io.fabric8.kubernetes.client.dsl.Listable;
import io.fabric8.kubernetes.client.dsl.Resource;

import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.ContainerPort;
import io.fabric8.kubernetes.api.model.EnvVar;
import io.fabric8.kubernetes.api.model.HTTPGetAction;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.PodList;
import io.fabric8.kubernetes.api.model.PodSpec;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.Probe;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretVolumeSource;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServicePort;
import io.fabric8.kubernetes.api.model.ServiceSpec;
import io.fabric8.kubernetes.api.model.Status;
import io.fabric8.kubernetes.api.model.Volume;
import io.fabric8.kubernetes.api.model.VolumeMount;

import io.fabric8.kubernetes.api.model.extensions.Deployment;
import io.fabric8.kubernetes.api.model.extensions.DeploymentSpec;
import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;

import io.grpc.health.v1.HealthCheckRequest;
import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
Expand Down Expand Up @@ -578,7 +560,7 @@ public void install(String namespace,
tls,
verifyTls);

this.kubernetesClient.extensions().deployments().inNamespace(namespace).create(deployment);
this.kubernetesClient.apps().deployments().inNamespace(namespace).create(deployment);

final Service service = this.createService(namespace, normalizeServiceName(serviceName), labels);
this.kubernetesClient.services().inNamespace(namespace).create(service);
Expand Down Expand Up @@ -627,7 +609,7 @@ public void upgrade(String namespace,
namespace = normalizeNamespace(namespace);
serviceName = normalizeServiceName(serviceName);

final Resource<Deployment, DoneableDeployment> resource = this.kubernetesClient.extensions()
final Resource<Deployment, DoneableDeployment> resource = this.kubernetesClient.apps()
.deployments()
.inNamespace(namespace)
.withName(normalizeDeploymentName(deploymentName));
Expand Down Expand Up @@ -836,7 +818,10 @@ protected DeploymentSpec createDeploymentSpec(final Map<String, String> labels,
podSpec.setVolumes(Arrays.asList(volume));
}
podTemplateSpec.setSpec(podSpec);
deploymentSpec.setTemplate(podTemplateSpec);
deploymentSpec.setTemplate(podTemplateSpec);
LabelSelector selector = new LabelSelector();
selector.setMatchLabels(labels);
deploymentSpec.setSelector(selector);
return deploymentSpec;
}

Expand Down