Skip to content

Commit 6d92f1f

Browse files
tmshorttmshort
committed
WIP: Add support for podLabels and priorityClassName
Signed-off-by: Todd Short <[email protected]>
1 parent 91c11cb commit 6d92f1f

7 files changed

+63
-5
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ spec:
2424
{{- include "olmv1.annotations" . | nindent 8 }}
2525
labels:
2626
control-plane: catalogd-controller-manager
27+
{{- include "olmv1.labels" . | nindent 8 }}
28+
{{- with .Values.components.catalogd.deployment.podLabels }}
29+
{{- toYamlPretty . | nindent 8 }}
30+
{{- end }}
2731
spec:
32+
{{- if .Values.components.catalogd.deployment.priorityClassName }}
33+
priorityClassName: {{ .Values.components.catalogd.deployment.priorityClassName }}
34+
{{- end }}
2835
affinity:
2936
nodeAffinity:
3037
requiredDuringSchedulingIgnoredDuringExecution:
@@ -64,7 +71,7 @@ spec:
6471
- name: GOCOVERDIR
6572
value: /e2e-coverage
6673
{{- end }}
67-
{{- with .Values.components.catalogd.deployment.env}}
74+
{{- with .Values.components.catalogd.deployment.env }}
6875
{{- toYamlPretty . | nindent 12 }}
6976
{{- end }}
7077
image: "{{ .Values.components.catalogd.deployment.image }}"

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@ spec:
2323
{{- include "olmv1.annotations" . | nindent 8 }}
2424
labels:
2525
control-plane: operator-controller-controller-manager
26+
{{- include "olmv1.labels" . | nindent 8 }}
27+
{{- with .Values.components.operatorController.deployment.podLabels }}
28+
{{- toYamlPretty . | nindent 8 }}
29+
{{- end }}
2630
spec:
31+
{{- if .Values.components.operatorController.deployment.priorityClassName }}
32+
priorityClassName: {{ .Values.components.operatorController.deployment.priorityClassName }}
33+
{{- end }}
2734
affinity:
2835
nodeAffinity:
2936
requiredDuringSchedulingIgnoredDuringExecution:

‎helm/olmv1/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ components:
1515
nodeSelector: {}
1616
tolerations: []
1717
podArguments: []
18+
podLabels: {}
19+
priorityClassName: ""
1820
env: []
1921
service:
2022
annotations: {}
@@ -33,6 +35,8 @@ components:
3335
nodeSelector: {}
3436
tolerations: []
3537
podArguments: []
38+
podLabels: {}
39+
priorityClassName: ""
3640
env: []
3741
service:
3842
annotations: {}

‎manifests/experimental-e2e.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metadata:
6262
app.kubernetes.io/version: "1.3.0"
6363
app.kubernetes.io/managed-by: Helm
6464
app.kubernetes.io/part-of: olm
65-
name: default-deny-all-traffic
65+
name: operator-controller-default-deny-all-traffic
6666
namespace: olmv1-system
6767
spec:
6868
podSelector: {}
@@ -1898,6 +1898,11 @@ spec:
18981898
olm.operatorframework.io/feature-set: experimental-e2e
18991899
labels:
19001900
control-plane: catalogd-controller-manager
1901+
helm.sh/chart: olmv1-0.1.0
1902+
app.kubernetes.io/instance: olmv1
1903+
app.kubernetes.io/version: "1.3.0"
1904+
app.kubernetes.io/managed-by: Helm
1905+
app.kubernetes.io/part-of: olm
19011906
spec:
19021907
affinity:
19031908
nodeAffinity:
@@ -2021,6 +2026,11 @@ spec:
20212026
olm.operatorframework.io/feature-set: experimental-e2e
20222027
labels:
20232028
control-plane: operator-controller-controller-manager
2029+
helm.sh/chart: olmv1-0.1.0
2030+
app.kubernetes.io/instance: olmv1
2031+
app.kubernetes.io/version: "1.3.0"
2032+
app.kubernetes.io/managed-by: Helm
2033+
app.kubernetes.io/part-of: olm
20242034
spec:
20252035
affinity:
20262036
nodeAffinity:

‎manifests/experimental.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metadata:
6262
app.kubernetes.io/version: "1.3.0"
6363
app.kubernetes.io/managed-by: Helm
6464
app.kubernetes.io/part-of: olm
65-
name: default-deny-all-traffic
65+
name: operator-controller-default-deny-all-traffic
6666
namespace: olmv1-system
6767
spec:
6868
podSelector: {}
@@ -1811,6 +1811,11 @@ spec:
18111811
olm.operatorframework.io/feature-set: experimental
18121812
labels:
18131813
control-plane: catalogd-controller-manager
1814+
helm.sh/chart: olmv1-0.1.0
1815+
app.kubernetes.io/instance: olmv1
1816+
app.kubernetes.io/version: "1.3.0"
1817+
app.kubernetes.io/managed-by: Helm
1818+
app.kubernetes.io/part-of: olm
18141819
spec:
18151820
affinity:
18161821
nodeAffinity:
@@ -1926,6 +1931,11 @@ spec:
19261931
olm.operatorframework.io/feature-set: experimental
19271932
labels:
19281933
control-plane: operator-controller-controller-manager
1934+
helm.sh/chart: olmv1-0.1.0
1935+
app.kubernetes.io/instance: olmv1
1936+
app.kubernetes.io/version: "1.3.0"
1937+
app.kubernetes.io/managed-by: Helm
1938+
app.kubernetes.io/part-of: olm
19291939
spec:
19301940
affinity:
19311941
nodeAffinity:

‎manifests/standard-e2e.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metadata:
6262
app.kubernetes.io/version: "1.3.0"
6363
app.kubernetes.io/managed-by: Helm
6464
app.kubernetes.io/part-of: olm
65-
name: default-deny-all-traffic
65+
name: operator-controller-default-deny-all-traffic
6666
namespace: olmv1-system
6767
spec:
6868
podSelector: {}
@@ -1898,6 +1898,11 @@ spec:
18981898
olm.operatorframework.io/feature-set: standard-e2e
18991899
labels:
19001900
control-plane: catalogd-controller-manager
1901+
helm.sh/chart: olmv1-0.1.0
1902+
app.kubernetes.io/instance: olmv1
1903+
app.kubernetes.io/version: "1.3.0"
1904+
app.kubernetes.io/managed-by: Helm
1905+
app.kubernetes.io/part-of: olm
19011906
spec:
19021907
affinity:
19031908
nodeAffinity:
@@ -2020,6 +2025,11 @@ spec:
20202025
olm.operatorframework.io/feature-set: standard-e2e
20212026
labels:
20222027
control-plane: operator-controller-controller-manager
2028+
helm.sh/chart: olmv1-0.1.0
2029+
app.kubernetes.io/instance: olmv1
2030+
app.kubernetes.io/version: "1.3.0"
2031+
app.kubernetes.io/managed-by: Helm
2032+
app.kubernetes.io/part-of: olm
20232033
spec:
20242034
affinity:
20252035
nodeAffinity:

‎manifests/standard.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metadata:
6262
app.kubernetes.io/version: "1.3.0"
6363
app.kubernetes.io/managed-by: Helm
6464
app.kubernetes.io/part-of: olm
65-
name: default-deny-all-traffic
65+
name: operator-controller-default-deny-all-traffic
6666
namespace: olmv1-system
6767
spec:
6868
podSelector: {}
@@ -1811,6 +1811,11 @@ spec:
18111811
olm.operatorframework.io/feature-set: standard
18121812
labels:
18131813
control-plane: catalogd-controller-manager
1814+
helm.sh/chart: olmv1-0.1.0
1815+
app.kubernetes.io/instance: olmv1
1816+
app.kubernetes.io/version: "1.3.0"
1817+
app.kubernetes.io/managed-by: Helm
1818+
app.kubernetes.io/part-of: olm
18141819
spec:
18151820
affinity:
18161821
nodeAffinity:
@@ -1925,6 +1930,11 @@ spec:
19251930
olm.operatorframework.io/feature-set: standard
19261931
labels:
19271932
control-plane: operator-controller-controller-manager
1933+
helm.sh/chart: olmv1-0.1.0
1934+
app.kubernetes.io/instance: olmv1
1935+
app.kubernetes.io/version: "1.3.0"
1936+
app.kubernetes.io/managed-by: Helm
1937+
app.kubernetes.io/part-of: olm
19281938
spec:
19291939
affinity:
19301940
nodeAffinity:

0 commit comments

Comments
 (0)