Skip to content
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

Jump to bottom

[JENKINS-60798] Current context should be set #19

Merged
merged 1 commit into from
Feb 6, 2020
Merged

[JENKINS-60798] Current context should be set #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/AbstractKubernetesAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(Kubernet
if (caCertificate != null && !caCertificate.isEmpty()) {
cluster.setCertificateAuthorityData(Utils.encodeBase64(Utils.wrapCertificate(caCertificate)));
}
cluster.setInsecureSkipTlsVerify(config.isSkipTlsVerify());
if (config.isSkipTlsVerify()) {
cluster.setInsecureSkipTlsVerify(config.isSkipTlsVerify());
}
configBuilder
.addNewCluster()
.withName(clusterName)
Expand All @@ -48,6 +50,7 @@ public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(Kubernet
.withUser(username)
.endContext()
.endContext();
configBuilder.withCurrentContext(context);
return configBuilder;
}

Expand Down
49 changes: 36 additions & 13 deletions src/test/java/org/jenkinsci/plugins/kubernetes/auth/impl/AbstractKubernetesAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import io.fabric8.kubernetes.api.model.AuthInfoBuilder;
import io.fabric8.kubernetes.api.model.Cluster;
import io.fabric8.kubernetes.client.ConfigBuilder;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
Expand All @@ -9,25 +10,47 @@
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

public class AbstractKubernetesAuthTest {
@Test
public void createConfig() throws Exception {
AbstractKubernetesAuth b = new AbstractKubernetesAuth() {
@Override
public ConfigBuilder decorate(ConfigBuilder builder, KubernetesAuthConfig config) throws KubernetesAuthException {
return builder;
}

@Override
AuthInfoBuilder decorate(AuthInfoBuilder builder, KubernetesAuthConfig config) throws KubernetesAuthException {
return builder;
}
};
AbstractKubernetesAuth b = new NoopKubernetesAuth();
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", false)), io.fabric8.kubernetes.api.model.Config.class
);
assertEquals("serverUrl", c.getClusters().get(0).getCluster().getServer());
assertEquals(Utils.encodeBase64(Utils.wrapCertificate("caCertificate")), c.getClusters().get(0).getCluster().getCertificateAuthorityData());
assertEquals(1, c.getClusters().size());
Cluster cluster = c.getClusters().get(0).getCluster();
assertEquals("serverUrl", cluster.getServer());
assertNull(cluster.getInsecureSkipTlsVerify());
assertEquals("k8s",c.getCurrentContext());
assertEquals(Utils.encodeBase64(Utils.wrapCertificate("caCertificate")), cluster.getCertificateAuthorityData());
}

@Test
public void skipTlsVerify() throws Exception {
AbstractKubernetesAuth b = new NoopKubernetesAuth();
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", true)), io.fabric8.kubernetes.api.model.Config.class
);
assertEquals(1, c.getClusters().size());
Cluster cluster = c.getClusters().get(0).getCluster();
assertEquals("serverUrl", cluster.getServer());
assertTrue(cluster.getInsecureSkipTlsVerify());
assertEquals("k8s",c.getCurrentContext());
assertEquals(Utils.encodeBase64(Utils.wrapCertificate("caCertificate")), cluster.getCertificateAuthorityData());
}

private static class NoopKubernetesAuth extends AbstractKubernetesAuth {
@Override
public ConfigBuilder decorate(ConfigBuilder builder, KubernetesAuthConfig config) throws KubernetesAuthException {
return builder;
}

@Override
AuthInfoBuilder decorate(AuthInfoBuilder builder, KubernetesAuthConfig config) throws KubernetesAuthException {
return builder;
}
}
}