Skip to content

Commit

Permalink
Upgrade kubernetes-client to 4.9.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
  • Loading branch information
@skabashnyuk
skabashnyuk committed Mar 17, 2020
1 parent ca5fc35 commit 170fb10
Show file tree
Hide file tree
Showing 17 changed files with 152 additions and 104 deletions.
9 changes: 3 additions & 6 deletions ...pse/che/workspace/infrastructure/kubernetes/environment/KubernetesEnvironmentFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import static java.lang.String.format;
import static org.eclipse.che.workspace.infrastructure.kubernetes.environment.PodMerger.DEPLOYMENT_NAME_LABEL;
import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesObjectUtil.putLabel;
import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesObjectUtil.setSelector;

import io.fabric8.kubernetes.api.model.ConfigMap;
Expand Down Expand Up @@ -177,12 +178,8 @@ private void mergePods(
// multiple pods/deployments are merged to one deployment
// to avoid issues because of overriding labels
// provision const label and selector to match all services to merged Deployment
deployment
.getSpec()
.getTemplate()
.getMetadata()
.getLabels()
.put(DEPLOYMENT_NAME_LABEL, deploymentName);
putLabel(
deployment.getSpec().getTemplate().getMetadata(), DEPLOYMENT_NAME_LABEL, deploymentName);
services.values().forEach(s -> setSelector(s, DEPLOYMENT_NAME_LABEL, deploymentName));
}

Expand Down
11 changes: 9 additions & 2 deletions .../main/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/PodMerger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -72,8 +73,12 @@ public Deployment merge(List<PodData> podsData) throws ValidationException {
for (PodData podData : podsData) {
// if there are entries with such keys then values will be overridden
ObjectMeta podMeta = podData.getMetadata();
basePodMeta.getLabels().putAll(podMeta.getLabels());
basePodMeta.getAnnotations().putAll(podMeta.getAnnotations());
if (podMeta.getLabels() != null) {
basePodMeta.getLabels().putAll(podMeta.getLabels());
}
if (podMeta.getAnnotations() != null) {
basePodMeta.getAnnotations().putAll(podMeta.getAnnotations());
}
basePodMeta.getAdditionalProperties().putAll(podMeta.getAdditionalProperties());

for (Container container : podData.getSpec().getContainers()) {
Expand Down Expand Up @@ -159,6 +164,8 @@ private Deployment createEmptyDeployment(String name) {
.withReplicas(1)
.withNewTemplate()
.withNewMetadata()
.withLabels(new LinkedHashMap<>())
.withAnnotations(new LinkedHashMap<>())
.endMetadata()
.withSpec(new PodSpec())
.endTemplate()
Expand Down
14 changes: 14 additions & 0 deletions ...a/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesObjectUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,24 @@ public static PersistentVolumeClaim newPVC(String name, String accessMode, Strin
*/
public static PersistentVolumeClaim newPVC(
String name, String accessMode, String quantity, String storageClassName) {
return newPVC(name, accessMode, quantity, storageClassName, null);
}

/**
* Returns new instance of {@link PersistentVolumeClaim} with specified name, accessMode,
* quantity, storageClassName and labels.
*/
public static PersistentVolumeClaim newPVC(
String name,
String accessMode,
String quantity,
String storageClassName,
Map<String, String> labels) {
SpecNested<PersistentVolumeClaimBuilder> specs =
new PersistentVolumeClaimBuilder()
.withNewMetadata()
.withName(name)
.withLabels(labels)
.endMetadata()
.withNewSpec()
.withAccessModes(accessMode);
Expand Down
66 changes: 29 additions & 37 deletions .../che/workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccount.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

import static com.google.common.base.Strings.isNullOrEmpty;

import io.fabric8.kubernetes.api.model.rbac.KubernetesPolicyRuleBuilder;
import io.fabric8.kubernetes.api.model.rbac.KubernetesRole;
import io.fabric8.kubernetes.api.model.rbac.KubernetesRoleBinding;
import io.fabric8.kubernetes.api.model.rbac.KubernetesRoleBindingBuilder;
import io.fabric8.kubernetes.api.model.rbac.KubernetesRoleBuilder;
import io.fabric8.kubernetes.api.model.rbac.KubernetesSubjectBuilder;
import io.fabric8.kubernetes.api.model.rbac.PolicyRuleBuilder;
import io.fabric8.kubernetes.api.model.rbac.Role;
import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
import io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder;
import io.fabric8.kubernetes.api.model.rbac.RoleBuilder;
import io.fabric8.kubernetes.api.model.rbac.SubjectBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesClientFactory;
Expand Down Expand Up @@ -76,35 +76,27 @@ void prepare() throws InfrastructureException {
}

String execRoleName = "exec";
if (k8sClient.rbac().kubernetesRoles().inNamespace(namespace).withName(execRoleName).get()
if (k8sClient.rbac().clusterRoles().inNamespace(namespace).withName(execRoleName).get()
== null) {
createExecRole(k8sClient, execRoleName);
}

String viewRoleName = "workspace-view";
if (k8sClient.rbac().kubernetesRoles().inNamespace(namespace).withName(viewRoleName).get()
if (k8sClient.rbac().clusterRoles().inNamespace(namespace).withName(viewRoleName).get()
== null) {
createViewRole(k8sClient, viewRoleName);
}

k8sClient
.rbac()
.kubernetesRoleBindings()
.inNamespace(namespace)
.createOrReplace(createExecRoleBinding());
k8sClient
.rbac()
.kubernetesRoleBindings()
.inNamespace(namespace)
.createOrReplace(createViewRoleBinding());
k8sClient.rbac().roleBindings().inNamespace(namespace).createOrReplace(createExecRoleBinding());
k8sClient.rbac().roleBindings().inNamespace(namespace).createOrReplace(createViewRoleBinding());

// If the user specified an additional cluster role for the workspace,
// create a role binding for it too
if (!isNullOrEmpty(this.clusterRoleName)) {
if (k8sClient.rbac().kubernetesClusterRoles().withName(this.clusterRoleName).get() != null) {
if (k8sClient.rbac().clusterRoles().withName(this.clusterRoleName).get() != null) {
k8sClient
.rbac()
.kubernetesRoleBindings()
.roleBindings()
.inNamespace(namespace)
.createOrReplace(createCustomRoleBinding(this.clusterRoleName));
} else {
Expand All @@ -128,39 +120,39 @@ private void createWorkspaceServiceAccount(KubernetesClient k8sClient) {
}

private void createExecRole(KubernetesClient k8sClient, String name) {
KubernetesRole execRole =
new KubernetesRoleBuilder()
Role execRole =
new RoleBuilder()
.withNewMetadata()
.withName(name)
.endMetadata()
.withRules(
new KubernetesPolicyRuleBuilder()
new PolicyRuleBuilder()
.withResources("pods/exec")
.withApiGroups("")
.withVerbs("create")
.build())
.build();
k8sClient.rbac().kubernetesRoles().inNamespace(namespace).create(execRole);
k8sClient.rbac().roles().inNamespace(namespace).create(execRole);
}

private void createViewRole(KubernetesClient k8sClient, String name) {
KubernetesRole viewRole =
new KubernetesRoleBuilder()
Role viewRole =
new RoleBuilder()
.withNewMetadata()
.withName(name)
.endMetadata()
.withRules(
new KubernetesPolicyRuleBuilder()
new PolicyRuleBuilder()
.withResources("pods", "services")
.withApiGroups("")
.withVerbs("list")
.build())
.build();
k8sClient.rbac().kubernetesRoles().inNamespace(namespace).create(viewRole);
k8sClient.rbac().roles().inNamespace(namespace).create(viewRole);
}

private KubernetesRoleBinding createViewRoleBinding() {
return new KubernetesRoleBindingBuilder()
private RoleBinding createViewRoleBinding() {
return new RoleBindingBuilder()
.withNewMetadata()
.withName(serviceAccountName + "-view")
.withNamespace(namespace)
Expand All @@ -170,16 +162,16 @@ private KubernetesRoleBinding createViewRoleBinding() {
.withName("workspace-view")
.endRoleRef()
.withSubjects(
new KubernetesSubjectBuilder()
new SubjectBuilder()
.withKind("ServiceAccount")
.withName(serviceAccountName)
.withNamespace(namespace)
.build())
.build();
}

private KubernetesRoleBinding createExecRoleBinding() {
return new KubernetesRoleBindingBuilder()
private RoleBinding createExecRoleBinding() {
return new RoleBindingBuilder()
.withNewMetadata()
.withName(serviceAccountName + "-exec")
.withNamespace(namespace)
Expand All @@ -189,16 +181,16 @@ private KubernetesRoleBinding createExecRoleBinding() {
.withName("exec")
.endRoleRef()
.withSubjects(
new KubernetesSubjectBuilder()
new SubjectBuilder()
.withKind("ServiceAccount")
.withName(serviceAccountName)
.withNamespace(namespace)
.build())
.build();
}

private KubernetesRoleBinding createCustomRoleBinding(String clusterRoleName) {
return new KubernetesRoleBindingBuilder()
private RoleBinding createCustomRoleBinding(String clusterRoleName) {
return new RoleBindingBuilder()
.withNewMetadata()
.withName(serviceAccountName + "-custom")
.withNamespace(namespace)
Expand All @@ -208,7 +200,7 @@ private KubernetesRoleBinding createCustomRoleBinding(String clusterRoleName) {
.withName(clusterRoleName)
.endRoleRef()
.withSubjects(
new KubernetesSubjectBuilder()
new SubjectBuilder()
.withKind("ServiceAccount")
.withName(serviceAccountName)
.withNamespace(namespace)
Expand Down
12 changes: 6 additions & 6 deletions ...clipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ public PerWorkspacePVCStrategy(

@Override
protected PersistentVolumeClaim createCommonPVC(String workspaceId) {
String pvcName = pvcNamePrefix + '-' + workspaceId;

PersistentVolumeClaim perWorkspacePVC =
newPVC(pvcName, pvcAccessMode, pvcQuantity, pvcStorageClassName);
perWorkspacePVC.getMetadata().getLabels().put(CHE_WORKSPACE_ID_LABEL, workspaceId);
return perWorkspacePVC;
return newPVC(
pvcNamePrefix + '-' + workspaceId,
pvcAccessMode,
pvcQuantity,
pvcStorageClassName,
ImmutableMap.of(CHE_WORKSPACE_ID_LABEL, workspaceId));
}

@Override
Expand Down
1 change: 1 addition & 0 deletions ...rkspace/infrastructure/kubernetes/server/secure/jwtproxy/AbstractJwtProxyProvisioner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ private Pod createJwtProxyPod() {
null,
"che-jwtproxy-config-volume",
false,
null,
null))
.withArgs("-config", JWT_PROXY_CONFIG_FOLDER + "/" + JWT_PROXY_CONFIG_FILE)
.addNewEnv()
Expand Down
4 changes: 2 additions & 2 deletions ...es/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/Containers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static long getRamLimit(Container container) {
&& resources.getLimits() != null
&& (quantity = resources.getLimits().get("memory")) != null
&& quantity.getAmount() != null) {
return KubernetesSize.toBytes(quantity.getAmount());
return Quantity.getAmountInBytes(quantity).longValue();
}
return 0;
}
Expand Down Expand Up @@ -82,7 +82,7 @@ public static long getRamRequest(Container container) {
&& resources.getRequests() != null
&& (quantity = resources.getRequests().get("memory")) != null
&& quantity.getAmount() != null) {
return KubernetesSize.toBytes(quantity.getAmount());
return Quantity.getAmountInBytes(quantity).longValue();
}
return 0;
}
Expand Down
9 changes: 7 additions & 2 deletions ...n/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/MachineResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.eclipse.che.api.workspace.shared.Constants.PROJECTS_VOLUME_NAME;

import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.Quantity;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -109,7 +110,9 @@ private void normalizeMemory(Container container, InternalMachineConfig machineC
.getAttributes()
.put(
MEMORY_LIMIT_ATTRIBUTE,
Long.toString(KubernetesSize.toBytes(overriddenSidecarMemLimit)));
Long.toString(
Quantity.getAmountInBytes(Quantity.parse(overriddenSidecarMemLimit))
.longValue()));
}

long ramRequest = Containers.getRamRequest(container);
Expand All @@ -122,7 +125,9 @@ private void normalizeMemory(Container container, InternalMachineConfig machineC
.getAttributes()
.put(
MEMORY_REQUEST_ATTRIBUTE,
Long.toString(KubernetesSize.toBytes(overriddenSidecarMemRequest)));
Long.toString(
Quantity.getAmountInBytes(Quantity.parse(overriddenSidecarMemRequest))
.longValue()));
}
}

Expand Down
3 changes: 2 additions & 1 deletion .../workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ private Container newContainer(
.withImagePullPolicy(brokerPullPolicy)
.withEnv(envVars);
if (brokerVolumeName != null) {
cb.withVolumeMounts(new VolumeMount(CONF_FOLDER + "/", null, brokerVolumeName, true, null));
cb.withVolumeMounts(
new VolumeMount(CONF_FOLDER + "/", null, brokerVolumeName, true, null, null));
cb.addToArgs("-metas", CONF_FOLDER + "/" + CONFIG_FILE);
}
Container container = cb.build();
Expand Down
3 changes: 2 additions & 1 deletion ...rkspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplierTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ public void shouldProvisionContainerWithMemoryLimitSpecified() throws Exception
assertEquals(podTemplate.getSpec().getContainers().size(), 1);
Container container = podTemplate.getSpec().getContainers().get(0);
Quantity memoryLimit = container.getResources().getLimits().get("memory");
assertEquals(memoryLimit.getAmount(), "1G");
assertEquals(memoryLimit.getAmount(), "1");
assertEquals(memoryLimit.getFormat(), "G");
}

@Test
Expand Down
25 changes: 21 additions & 4 deletions .../eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeploymentsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
import io.fabric8.kubernetes.api.model.PodList;
import io.fabric8.kubernetes.api.model.PodStatus;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentList;
import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
Expand All @@ -55,7 +57,7 @@
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.PodResource;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.dsl.ScalableResource;
import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
import java.util.Calendar;
import java.util.Date;
import java.util.Optional;
Expand Down Expand Up @@ -91,9 +93,24 @@ public class KubernetesDeploymentsTest {

// Deployments Mocks
@Mock private AppsAPIGroupDSL apps;
@Mock private MixedOperation deploymentsMixedOperation;
@Mock private NonNamespaceOperation deploymentsNamespaceOperation;
@Mock private ScalableResource deploymentResource;

@Mock
private MixedOperation<
Deployment,
DeploymentList,
DoneableDeployment,
RollableScalableResource<Deployment, DoneableDeployment>>
deploymentsMixedOperation;

@Mock
private NonNamespaceOperation<
Deployment,
DeploymentList,
DoneableDeployment,
RollableScalableResource<Deployment, DoneableDeployment>>
deploymentsNamespaceOperation;

@Mock private RollableScalableResource<Deployment, DoneableDeployment> deploymentResource;
@Mock private Deployment deployment;
@Mock private ObjectMeta deploymentMetadata;
@Mock private DeploymentSpec deploymentSpec;
Expand Down
Loading

0 comments on commit 170fb10

Please sign in to comment.