Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

kubeconfig-in-cluster is not a secret #793

Merged
Merged
Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions e2e/checkpointer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,16 +367,16 @@ 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
}
kc.ObjectMeta = metav1.ObjectMeta{
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
}

Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions pkg/asset/internal/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down