Skip to content

Commit c4aff83

Browse files
committed
k8s-infra: Add ExternalSecret for kOps build cluster
Related to: - kubernetes/k8s.io#5127 Add the kubeconfig of the EKS cluster k8s-infra-kops-prow-build. Signed-off-by: Arnaud Meukam <[email protected]>
1 parent 05d895d commit c4aff83

5 files changed

+40
-5
lines changed

config/prow/cluster/crier_deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
env:
4949
# Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
5050
- name: KUBECONFIG
51-
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig"
51+
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig"
5252
# AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
5353
- name: AWS_ROLE_ARN
5454
value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -75,6 +75,9 @@ spec:
7575
- mountPath: /etc/kubeconfig-eks-prow-build-cluster
7676
name: kubeconfig-eks-prow-build-cluster
7777
readOnly: true
78+
- mountPath: /etc/kubeconfig-k8s-infra-kops-prow-build
79+
name: kubeconfig-k8s-infra-kops-prow-build
80+
readOnly: true
7881
- name: config
7982
mountPath: /etc/config
8083
readOnly: true
@@ -124,6 +127,10 @@ spec:
124127
secret:
125128
defaultMode: 420
126129
secretName: kubeconfig-eks-prow-build-cluster
130+
- name: kubeconfig-k8s-infra-kops-prow-build
131+
secret:
132+
defaultMode: 420
133+
secretName: kubeconfig-k8s-infra-kops-prow-build
127134
# AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
128135
- name: aws-iam-token
129136
projected:

config/prow/cluster/deck_deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
env:
6464
# Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
6565
- name: KUBECONFIG
66-
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig"
66+
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig::/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig"
6767
# AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
6868
- name: AWS_ROLE_ARN
6969
value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -93,6 +93,9 @@ spec:
9393
- mountPath: /etc/kubeconfig-eks-prow-build-cluster
9494
name: kubeconfig-eks-prow-build-cluster
9595
readOnly: true
96+
- mountPath: /etc/kubeconfig-k8s-infra-kops-prow-build
97+
name: kubeconfig-k8s-infra-kops-prow-build
98+
readOnly: true
9699
- name: config
97100
mountPath: /etc/config
98101
readOnly: true
@@ -152,6 +155,10 @@ spec:
152155
secret:
153156
defaultMode: 420
154157
secretName: kubeconfig-eks-prow-build-cluster
158+
- name: kubeconfig-k8s-infra-kops-prow-build
159+
secret:
160+
defaultMode: 420
161+
secretName: kubeconfig-k8s-infra-kops-prow-build
155162
- name: config
156163
configMap:
157164
name: config

config/prow/cluster/hook_deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spec:
5151
env:
5252
# Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
5353
- name: KUBECONFIG
54-
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig"
54+
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig::/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig"
5555
# AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
5656
- name: AWS_ROLE_ARN
5757
value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -103,6 +103,9 @@ spec:
103103
- mountPath: /etc/kubeconfig-eks-prow-build-cluster
104104
name: kubeconfig-eks-prow-build-cluster
105105
readOnly: true
106+
- mountPath: /etc/kubeconfig-k8s-infra-kops-prow-build
107+
name: kubeconfig-k8s-infra-kops-prow-build
108+
readOnly: true
106109
# AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
107110
- mountPath: /var/run/secrets/aws-iam-token/serviceaccount
108111
name: aws-iam-token
@@ -165,6 +168,10 @@ spec:
165168
secret:
166169
defaultMode: 420
167170
secretName: kubeconfig-eks-prow-build-cluster
171+
- name: kubeconfig-k8s-infra-kops-prow-build
172+
secret:
173+
defaultMode: 420
174+
secretName: kubeconfig-k8s-infra-kops-prow-build
168175
# AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
169176
- name: aws-iam-token
170177
projected:

config/prow/cluster/prow_controller_manager_deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
env:
4949
# Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
5050
- name: KUBECONFIG
51-
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig"
51+
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig::/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig"
5252
# AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
5353
- name: AWS_ROLE_ARN
5454
value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -75,6 +75,9 @@ spec:
7575
- mountPath: /etc/kubeconfig-eks-prow-build-cluster
7676
name: kubeconfig-eks-prow-build-cluster
7777
readOnly: true
78+
- mountPath: /etc/kubeconfig-k8s-infra-kops-prow-build
79+
name: kubeconfig-k8s-infra-kops-prow-build
80+
readOnly: true
7881
- name: config
7982
mountPath: /etc/config
8083
readOnly: true
@@ -118,6 +121,10 @@ spec:
118121
secret:
119122
defaultMode: 420
120123
secretName: kubeconfig-eks-prow-build-cluster
124+
- name: kubeconfig-k8s-infra-kops-prow-build
125+
secret:
126+
defaultMode: 420
127+
secretName: kubeconfig-k8s-infra-kops-prow-build
121128
- name: config
122129
configMap:
123130
name: config

config/prow/cluster/sinker_deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
env:
2727
# Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
2828
- name: KUBECONFIG
29-
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig"
29+
value: "/etc/kubeconfig/config:/etc/kubeconfig-build-test-infra-trusted/kubeconfig:/etc/kubeconfig-build-k8s-prow-builds/kubeconfig:/etc/kubeconfig-build-rules-k8s/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig::/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig"
3030
# AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
3131
- name: AWS_ROLE_ARN
3232
value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -53,6 +53,9 @@ spec:
5353
- mountPath: /etc/kubeconfig-eks-prow-build-cluster
5454
name: kubeconfig-eks-prow-build-cluster
5555
readOnly: true
56+
- mountPath: /etc/kubeconfig-k8s-infra-kops-prow-build
57+
name: kubeconfig-k8s-infra-kops-prow-build
58+
readOnly: true
5659
- name: config
5760
mountPath: /etc/config
5861
readOnly: true
@@ -84,6 +87,10 @@ spec:
8487
secret:
8588
defaultMode: 420
8689
secretName: kubeconfig-eks-prow-build-cluster
90+
- name: kubeconfig-k8s-infra-kops-prow-build
91+
secret:
92+
defaultMode: 420
93+
secretName: kubeconfig-k8s-infra-kops-prow-build
8794
- name: config
8895
configMap:
8996
name: config

0 commit comments

Comments
 (0)