From 83b25923115d0afcb23caea6b473f6c90dd17d88 Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Wed, 6 Dec 2017 11:37:17 +0000 Subject: [PATCH 1/2] kubeconfig-in-cluster is not a secret --- pkg/asset/internal/templates.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go index 8dae32eb8..ca163ee67 100644 --- a/pkg/asset/internal/templates.go +++ b/pkg/asset/internal/templates.go @@ -311,8 +311,8 @@ spec: effect: NoSchedule volumes: - name: kubeconfig - secret: - secretName: kubeconfig-in-cluster + configMap: + name: kubeconfig-in-cluster - name: etc-kubernetes hostPath: path: /etc/kubernetes @@ -652,8 +652,8 @@ spec: hostPath: path: /usr/share/ca-certificates - name: kubeconfig - secret: - secretName: kubeconfig-in-cluster + configMap: + name: kubeconfig-in-cluster updateStrategy: rollingUpdate: maxUnavailable: 1 @@ -690,11 +690,11 @@ subjects: // (chicken and egg), and the checkpointer, which needs to run as a static pod // even if the API server isn't available. var KubeConfigInClusterTemplate = []byte(`apiVersion: v1 -kind: Secret +kind: ConfigMap metadata: name: kubeconfig-in-cluster namespace: kube-system -stringData: +data: kubeconfig: | apiVersion: v1 clusters: From 7911f2fcfb82c52a18f1ce55e147f1ebcd3b3585 Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Tue, 12 Dec 2017 00:04:16 +0000 Subject: [PATCH 2/2] Update e2e tests --- e2e/checkpointer_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/e2e/checkpointer_test.go b/e2e/checkpointer_test.go index df3449461..fcd4ae345 100644 --- a/e2e/checkpointer_test.go +++ b/e2e/checkpointer_test.go @@ -367,8 +367,8 @@ func waitCluster(t *testing.T) *Cluster { } func setupTestCheckpointerRole(namespace string) error { - // Copy special kubeconfig-in-cluster secret from kube-system namespace. - kc, err := client.CoreV1().Secrets(metav1.NamespaceSystem).Get("kubeconfig-in-cluster", metav1.GetOptions{}) + // Copy special kubeconfig-in-cluster configmap from kube-system namespace. + kc, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get("kubeconfig-in-cluster", metav1.GetOptions{}) if err != nil { return err } @@ -376,7 +376,7 @@ func setupTestCheckpointerRole(namespace string) error { Name: kc.ObjectMeta.Name, Namespace: namespace, } - if _, err := client.CoreV1().Secrets(namespace).Create(kc); err != nil { + if _, err := client.CoreV1().ConfigMaps(namespace).Create(kc); err != nil { return err } @@ -476,8 +476,8 @@ spec: restartPolicy: Always volumes: - name: kubeconfig - secret: - secretName: kubeconfig-in-cluster + configMap: + name: kubeconfig-in-cluster - name: etc-kubernetes hostPath: path: /etc/kubernetes