Skip to content

Commit 68d89de

Browse files
tmshorttmshort
committed
WIP: update volumes to be consistent with downstream
Signed-off-by: Todd Short <[email protected]>
1 parent 458db97 commit 68d89de

7 files changed

+149
-79
lines changed

‎helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ spec:
9797
{{- if .Values.components.certManager.enabled }}
9898
- mountPath: /var/certs
9999
name: catalogserver-certs
100-
- mountPath: /var/ca-certs/
101-
name: olmv1-certificate
100+
- mountPath: /var/ca-certs
101+
name: ca-certs
102102
readOnly: true
103103
{{- end }}
104104
{{- with .Values.components.catalogd.deployment.volumeMounts }}
@@ -121,8 +121,14 @@ spec:
121121
{{- if .Values.components.certManager.enabled }}
122122
- name: catalogserver-certs
123123
secret:
124+
items:
125+
- key: tls.crt
126+
path: tls.crt
127+
- key: tls.key
128+
path: tls.key
129+
optional: false
124130
secretName: catalogd-service-cert-git-version
125-
- name: olmv1-certificate
131+
- name: ca-certs
126132
secret:
127133
items:
128134
- key: ca.crt

‎helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ spec:
5252
- --feature-gates=HelmChartSupport=true
5353
{{- end }}
5454
{{- if .Values.components.certManager.enabled }}
55-
- --catalogd-cas-dir=/var/certs
56-
- --pull-cas-dir=/var/certs
57-
- --tls-cert=/var/certs/tls.cert
55+
- --catalogd-cas-dir=/var/ca-certs
56+
- --pull-cas-dir=/var/ca-certs
57+
- --tls-cert=/var/certs/tls.crt
5858
- --tls-key=/var/certs/tls.key
5959
{{- end }}
6060
{{- with .Values.components.operatorController.deployment.podArguments }}
@@ -106,8 +106,11 @@ spec:
106106
- mountPath: /tmp
107107
name: tmp
108108
{{- if .Values.components.certManager.enabled }}
109-
- mountPath: /var/certs/
110-
name: olmv1-certificate
109+
- mountPath: /var/certs
110+
name: operator-controller-certs
111+
readOnly: true
112+
- mountPath: /var/ca-certs
113+
name: ca-certs
111114
readOnly: true
112115
{{- end }}
113116
{{- with .Values.components.operatorController.deployment.volumeMounts }}
@@ -131,17 +134,22 @@ spec:
131134
- emptyDir: {}
132135
name: tmp
133136
{{- if .Values.components.certManager.enabled }}
134-
- name: olmv1-certificate
137+
- name: operator-controller-certs
135138
secret:
136139
items:
137-
- key: ca.crt
138-
path: olm-ca.crt
139140
- key: tls.crt
140-
path: tls.cert
141+
path: tls.crt
141142
- key: tls.key
142143
path: tls.key
143144
optional: false
144-
secretName: olmv1-cert
145+
secretName: operator-controller-cert
146+
- name: ca-certs
147+
secret:
148+
items:
149+
- key: ca.crt
150+
path: olm-ca.crt
151+
optional: false
152+
secretName: operator-controller-cert
145153
{{- end }}
146154
{{- with .Values.components.operatorController.deployment.volumes }}
147155
{{- toYaml . | nindent 8 }}

‎helm/olmv1/templates/33-certificate-olmv1-system-olmv1-cert.yml‎ renamed to ‎helm/olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app.kubernetes.io/name: olmv1
99
{{- include "olmv1.labels" . | nindent 4 }}
10-
name: olmv1-cert
10+
name: operator-controller-cert
1111
namespace: {{ .Values.namespaces.olmv1.name }}
1212
spec:
1313
dnsNames:
@@ -21,5 +21,5 @@ spec:
2121
algorithm: ECDSA
2222
rotationPolicy: Always
2323
size: 256
24-
secretName: olmv1-cert
24+
secretName: operator-controller-cert
2525
{{- end }}

‎manifests/experimental-e2e.yaml‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,8 +1810,8 @@ spec:
18101810
name: tmp
18111811
- mountPath: /var/certs
18121812
name: catalogserver-certs
1813-
- mountPath: /var/ca-certs/
1814-
name: olmv1-certificate
1813+
- mountPath: /var/ca-certs
1814+
name: ca-certs
18151815
readOnly: true
18161816
imagePullPolicy: IfNotPresent
18171817
securityContext:
@@ -1832,8 +1832,14 @@ spec:
18321832
name: tmp
18331833
- name: catalogserver-certs
18341834
secret:
1835+
items:
1836+
- key: tls.crt
1837+
path: tls.crt
1838+
- key: tls.key
1839+
path: tls.key
1840+
optional: false
18351841
secretName: catalogd-service-cert-git-version
1836-
- name: olmv1-certificate
1842+
- name: ca-certs
18371843
secret:
18381844
items:
18391845
- key: ca.crt
@@ -1914,9 +1920,9 @@ spec:
19141920
- --feature-gates=SingleOwnNamespaceInstallSupport=true
19151921
- --feature-gates=PreflightPermissions=true
19161922
- --feature-gates=HelmChartSupport=true
1917-
- --catalogd-cas-dir=/var/certs
1918-
- --pull-cas-dir=/var/certs
1919-
- --tls-cert=/var/certs/tls.cert
1923+
- --catalogd-cas-dir=/var/ca-certs
1924+
- --pull-cas-dir=/var/ca-certs
1925+
- --tls-cert=/var/certs/tls.crt
19201926
- --tls-key=/var/certs/tls.key
19211927
command:
19221928
- /operator-controller
@@ -1950,8 +1956,11 @@ spec:
19501956
name: cache
19511957
- mountPath: /tmp
19521958
name: tmp
1953-
- mountPath: /var/certs/
1954-
name: olmv1-certificate
1959+
- mountPath: /var/certs
1960+
name: operator-controller-certs
1961+
readOnly: true
1962+
- mountPath: /var/ca-certs
1963+
name: ca-certs
19551964
readOnly: true
19561965
imagePullPolicy: IfNotPresent
19571966
securityContext:
@@ -1973,17 +1982,22 @@ spec:
19731982
name: cache
19741983
- emptyDir: {}
19751984
name: tmp
1976-
- name: olmv1-certificate
1985+
- name: operator-controller-certs
19771986
secret:
19781987
items:
1979-
- key: ca.crt
1980-
path: olm-ca.crt
19811988
- key: tls.crt
1982-
path: tls.cert
1989+
path: tls.crt
19831990
- key: tls.key
19841991
path: tls.key
19851992
optional: false
1986-
secretName: olmv1-cert
1993+
secretName: operator-controller-cert
1994+
- name: ca-certs
1995+
secret:
1996+
items:
1997+
- key: ca.crt
1998+
path: olm-ca.crt
1999+
optional: false
2000+
secretName: operator-controller-cert
19872001
affinity:
19882002
nodeAffinity:
19892003
requiredDuringSchedulingIgnoredDuringExecution:
@@ -2074,7 +2088,7 @@ spec:
20742088
size: 256
20752089
secretName: catalogd-service-cert-git-version
20762090
---
2077-
# Source: olmv1/templates/33-certificate-olmv1-system-olmv1-cert.yml
2091+
# Source: olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml
20782092
apiVersion: cert-manager.io/v1
20792093
kind: Certificate
20802094
metadata:
@@ -2083,7 +2097,7 @@ metadata:
20832097
labels:
20842098
app.kubernetes.io/name: olmv1
20852099
app.kubernetes.io/part-of: olm
2086-
name: olmv1-cert
2100+
name: operator-controller-cert
20872101
namespace: olmv1-system
20882102
spec:
20892103
dnsNames:
@@ -2097,7 +2111,7 @@ spec:
20972111
algorithm: ECDSA
20982112
rotationPolicy: Always
20992113
size: 256
2100-
secretName: olmv1-cert
2114+
secretName: operator-controller-cert
21012115
---
21022116
# Source: olmv1/templates/34-clusterissuer-olmv1-ca.yml
21032117
apiVersion: cert-manager.io/v1

‎manifests/experimental.yaml‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,8 +1730,8 @@ spec:
17301730
name: tmp
17311731
- mountPath: /var/certs
17321732
name: catalogserver-certs
1733-
- mountPath: /var/ca-certs/
1734-
name: olmv1-certificate
1733+
- mountPath: /var/ca-certs
1734+
name: ca-certs
17351735
readOnly: true
17361736
imagePullPolicy: IfNotPresent
17371737
securityContext:
@@ -1749,8 +1749,14 @@ spec:
17491749
name: tmp
17501750
- name: catalogserver-certs
17511751
secret:
1752+
items:
1753+
- key: tls.crt
1754+
path: tls.crt
1755+
- key: tls.key
1756+
path: tls.key
1757+
optional: false
17521758
secretName: catalogd-service-cert-git-version
1753-
- name: olmv1-certificate
1759+
- name: ca-certs
17541760
secret:
17551761
items:
17561762
- key: ca.crt
@@ -1831,9 +1837,9 @@ spec:
18311837
- --feature-gates=SingleOwnNamespaceInstallSupport=true
18321838
- --feature-gates=PreflightPermissions=true
18331839
- --feature-gates=HelmChartSupport=true
1834-
- --catalogd-cas-dir=/var/certs
1835-
- --pull-cas-dir=/var/certs
1836-
- --tls-cert=/var/certs/tls.cert
1840+
- --catalogd-cas-dir=/var/ca-certs
1841+
- --pull-cas-dir=/var/ca-certs
1842+
- --tls-cert=/var/certs/tls.crt
18371843
- --tls-key=/var/certs/tls.key
18381844
command:
18391845
- /operator-controller
@@ -1860,8 +1866,11 @@ spec:
18601866
name: cache
18611867
- mountPath: /tmp
18621868
name: tmp
1863-
- mountPath: /var/certs/
1864-
name: olmv1-certificate
1869+
- mountPath: /var/certs
1870+
name: operator-controller-certs
1871+
readOnly: true
1872+
- mountPath: /var/ca-certs
1873+
name: ca-certs
18651874
readOnly: true
18661875
imagePullPolicy: IfNotPresent
18671876
securityContext:
@@ -1877,17 +1886,22 @@ spec:
18771886
name: cache
18781887
- emptyDir: {}
18791888
name: tmp
1880-
- name: olmv1-certificate
1889+
- name: operator-controller-certs
18811890
secret:
18821891
items:
1883-
- key: ca.crt
1884-
path: olm-ca.crt
18851892
- key: tls.crt
1886-
path: tls.cert
1893+
path: tls.crt
18871894
- key: tls.key
18881895
path: tls.key
18891896
optional: false
1890-
secretName: olmv1-cert
1897+
secretName: operator-controller-cert
1898+
- name: ca-certs
1899+
secret:
1900+
items:
1901+
- key: ca.crt
1902+
path: olm-ca.crt
1903+
optional: false
1904+
secretName: operator-controller-cert
18911905
affinity:
18921906
nodeAffinity:
18931907
requiredDuringSchedulingIgnoredDuringExecution:
@@ -1978,7 +1992,7 @@ spec:
19781992
size: 256
19791993
secretName: catalogd-service-cert-git-version
19801994
---
1981-
# Source: olmv1/templates/33-certificate-olmv1-system-olmv1-cert.yml
1995+
# Source: olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml
19821996
apiVersion: cert-manager.io/v1
19831997
kind: Certificate
19841998
metadata:
@@ -1987,7 +2001,7 @@ metadata:
19872001
labels:
19882002
app.kubernetes.io/name: olmv1
19892003
app.kubernetes.io/part-of: olm
1990-
name: olmv1-cert
2004+
name: operator-controller-cert
19912005
namespace: olmv1-system
19922006
spec:
19932007
dnsNames:
@@ -2001,7 +2015,7 @@ spec:
20012015
algorithm: ECDSA
20022016
rotationPolicy: Always
20032017
size: 256
2004-
secretName: olmv1-cert
2018+
secretName: operator-controller-cert
20052019
---
20062020
# Source: olmv1/templates/34-clusterissuer-olmv1-ca.yml
20072021
apiVersion: cert-manager.io/v1

0 commit comments

Comments
 (0)