Skip to content

Commit d5c074c

Browse files
Merge pull request #817 from jianzhangbjz/priority
Add priorityClassName
2 parents b3f1869 + f713144 commit d5c074c

8 files changed

+15
-15
lines changed

deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ spec:
1818
app: olm-operator
1919
spec:
2020
serviceAccountName: olm-operator-serviceaccount
21+
{{- if and .Values.installType (eq .Values.installType "ocp") }}
22+
priorityClassName: "system-cluster-critical"
23+
{{- end }}
2124
containers:
2225
- name: olm-operator
2326
command:
@@ -47,9 +50,6 @@ spec:
4750
{{- end }}
4851
image: {{ .Values.olm.image.ref }}
4952
imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
50-
{{- if and .Values.installType (eq .Values.installType "ocp") }}
51-
priorityClassName: "system-cluster-critical"
52-
{{- end }}
5353
ports:
5454
- containerPort: {{ .Values.olm.service.internalPort }}
5555
- containerPort: 8081

deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ spec:
1818
app: catalog-operator
1919
spec:
2020
serviceAccountName: olm-operator-serviceaccount
21+
{{- if and .Values.installType (eq .Values.installType "ocp") }}
22+
priorityClassName: "system-cluster-critical"
23+
{{- end }}
2124
containers:
2225
- name: catalog-operator
2326
command:
@@ -49,9 +52,6 @@ spec:
4952
{{- end }}
5053
image: {{ .Values.catalog.image.ref }}
5154
imagePullPolicy: {{ .Values.catalog.image.pullPolicy }}
52-
{{- if and .Values.installType (eq .Values.installType "ocp") }}
53-
priorityClassName: "system-cluster-critical"
54-
{{- end }}
5555
ports:
5656
- containerPort: {{ .Values.catalog.service.internalPort }}
5757
- containerPort: 8081

deploy/chart/templates/_packageserver.deployment-spec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ spec:
1212
app: packageserver
1313
spec:
1414
serviceAccountName: packageserver
15+
{{- if and .Values.installType (eq .Values.installType "ocp") }}
16+
priorityClassName: "system-cluster-critical"
17+
{{- end }}
1518
{{- if .Values.package.nodeSelector }}
1619
nodeSelector:
1720
{{- toYaml .Values.package.nodeSelector | nindent 8 }}
@@ -41,9 +44,6 @@ spec:
4144
{{- end }}
4245
image: {{ .Values.package.image.ref }}
4346
imagePullPolicy: {{ .Values.package.image.pullPolicy }}
44-
{{- if and .Values.installType (eq .Values.installType "ocp") }}
45-
priorityClassName: "system-cluster-critical"
46-
{{- end }}
4747
ports:
4848
- containerPort: {{ .Values.package.service.internalPort }}
4949
livenessProbe:

manifests/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
app: olm-operator
1919
spec:
2020
serviceAccountName: olm-operator-serviceaccount
21+
priorityClassName: "system-cluster-critical"
2122
containers:
2223
- name: olm-operator
2324
command:
@@ -31,7 +32,6 @@ spec:
3132
- /var/run/secrets/serving-cert/tls.key
3233
image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
3334
imagePullPolicy: IfNotPresent
34-
priorityClassName: "system-cluster-critical"
3535
ports:
3636
- containerPort: 8080
3737
- containerPort: 8081

manifests/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
app: catalog-operator
1919
spec:
2020
serviceAccountName: olm-operator-serviceaccount
21+
priorityClassName: "system-cluster-critical"
2122
containers:
2223
- name: catalog-operator
2324
command:
@@ -34,7 +35,6 @@ spec:
3435
- /var/run/secrets/serving-cert/tls.key
3536
image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
3637
imagePullPolicy: IfNotPresent
37-
priorityClassName: "system-cluster-critical"
3838
ports:
3939
- containerPort: 8080
4040
- containerPort: 8081

manifests/0000_50_olm_11-olm-operators.configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ data:
8484
app: packageserver
8585
spec:
8686
serviceAccountName: packageserver
87+
priorityClassName: "system-cluster-critical"
8788
nodeSelector:
8889
beta.kubernetes.io/os: linux
8990
node-role.kubernetes.io/master: ""
@@ -102,7 +103,6 @@ data:
102103
- openshift-operator-lifecycle-manager
103104
image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
104105
imagePullPolicy: IfNotPresent
105-
priorityClassName: "system-cluster-critical"
106106
ports:
107107
- containerPort: 5443
108108
livenessProbe:
@@ -131,4 +131,4 @@ data:
131131
- packageName: packageserver
132132
channels:
133133
- name: alpha
134-
currentCSV: packageserver.v0.9.0
134+
currentCSV: packageserver.v0.9.0

manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ spec:
7676
app: packageserver
7777
spec:
7878
serviceAccountName: packageserver
79+
priorityClassName: "system-cluster-critical"
7980
nodeSelector:
8081
beta.kubernetes.io/os: linux
8182
node-role.kubernetes.io/master: ""
@@ -94,7 +95,6 @@ spec:
9495
- openshift-operator-lifecycle-manager
9596
image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
9697
imagePullPolicy: IfNotPresent
97-
priorityClassName: "system-cluster-critical"
9898
ports:
9999
- containerPort: 5443
100100
livenessProbe:

manifests/0000_50_olm_17-packageserver.deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
app: packageserver
1919
spec:
2020
serviceAccountName: packageserver
21+
priorityClassName: "system-cluster-critical"
2122
nodeSelector:
2223
beta.kubernetes.io/os: linux
2324
node-role.kubernetes.io/master: ""
@@ -36,7 +37,6 @@ spec:
3637
- openshift-operator-lifecycle-manager
3738
image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
3839
imagePullPolicy: IfNotPresent
39-
priorityClassName: "system-cluster-critical"
4040
ports:
4141
- containerPort: 5443
4242
livenessProbe:

0 commit comments

Comments
 (0)