Skip to content

Commit fc1711e

Browse files
committed
chore(deploy): re-sync manifests with the chart
1 parent 780b74b commit fc1711e

12 files changed

+63
-53
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ spec:
9696
{{- end }}
9797
{{- if .Values.olm.tolerations }}
9898
tolerations:
99-
{{ toYaml .Values.olm.tolerations | indent 8 }}
99+
{{ toYaml .Values.olm.tolerations | indent 6 }}
100100
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ spec:
9292
{{- end }}
9393
{{- if .Values.catalog.tolerations }}
9494
tolerations:
95-
{{ toYaml .Values.catalog.tolerations | indent 8 }}
95+
{{ toYaml .Values.catalog.tolerations | indent 6 }}
9696
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
{{- end }}
2222
{{- if .Values.package.tolerations }}
2323
tolerations:
24-
{{- toYaml .Values.package.tolerations | nindent 8 }}
24+
{{- toYaml .Values.package.tolerations | nindent 6 }}
2525
{{- end }}
2626
containers:
2727
- name: packageserver

deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: v1
44
kind: Namespace
55
metadata:
66
name: openshift-operator-lifecycle-manager
7+
78
annotations:
89
openshift.io/node-selector: ""
910
labels:
@@ -15,6 +16,7 @@ apiVersion: v1
1516
kind: Namespace
1617
metadata:
1718
name: openshift-operators
19+
1820
annotations:
1921
openshift.io/node-selector: ""
2022
labels:

deploy/ocp/manifests/0.9.0/0000_50_olm_03-clusterserviceversion.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ spec:
4646
status: {}
4747
validation:
4848
openAPIV3Schema:
49+
description: Represents an Operator that should be running on the cluster, including requirements and install strategy.
4950
properties:
5051
spec:
5152
type: object

deploy/ocp/manifests/0.9.0/0000_50_olm_04-installplan.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ spec:
4545
status: {}
4646
validation:
4747
openAPIV3Schema:
48+
description: Represents a plan to install and resolve dependencies for Cluster Services.
4849
properties:
4950
spec:
5051
type: object

manifests/0000_50_olm_00-namespace.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
name: openshift-operator-lifecycle-manager
5+
56
annotations:
6-
openshift.io/node-selector: ""
7+
openshift.io/node-selector: ""
78
labels:
89
openshift.io/run-level: "1"
910
openshift.io/cluster-monitoring: "true"
@@ -13,6 +14,7 @@ apiVersion: v1
1314
kind: Namespace
1415
metadata:
1516
name: openshift-operators
17+
1618
annotations:
1719
openshift.io/node-selector: ""
1820
labels:

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ spec:
7373
node-role.kubernetes.io/master: ""
7474

7575
tolerations:
76-
- key: node-role.kubernetes.io/master
76+
- effect: NoSchedule
77+
key: node-role.kubernetes.io/master
78+
operator: Exists
79+
- effect: NoExecute
80+
key: node.kubernetes.io/unreachable
7781
operator: Exists
78-
effect: "NoSchedule"
79-
- key: "node.kubernetes.io/unreachable"
80-
operator: "Exists"
81-
effect: "NoExecute"
8282
tolerationSeconds: 120
83-
- key: "node.kubernetes.io/not-ready"
84-
operator: "Exists"
85-
effect: "NoExecute"
86-
tolerationSeconds: 120
87-
83+
- effect: NoExecute
84+
key: node.kubernetes.io/not-ready
85+
operator: Exists
86+
tolerationSeconds: 120
87+

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ spec:
7070
node-role.kubernetes.io/master: ""
7171

7272
tolerations:
73-
- key: node-role.kubernetes.io/master
73+
- effect: NoSchedule
74+
key: node-role.kubernetes.io/master
75+
operator: Exists
76+
- effect: NoExecute
77+
key: node.kubernetes.io/unreachable
7478
operator: Exists
75-
effect: "NoSchedule"
76-
- key: "node.kubernetes.io/unreachable"
77-
operator: "Exists"
78-
effect: "NoExecute"
7979
tolerationSeconds: 120
80-
- key: "node.kubernetes.io/not-ready"
81-
operator: "Exists"
82-
effect: "NoExecute"
80+
- effect: NoExecute
81+
key: node.kubernetes.io/not-ready
82+
operator: Exists
8383
tolerationSeconds: 120
84-
84+

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,20 @@ data:
8888
nodeSelector:
8989
beta.kubernetes.io/os: linux
9090
node-role.kubernetes.io/master: ""
91+
9192
tolerations:
92-
- key: "node-role.kubernetes.io/master"
93-
operator: "Exists"
94-
effect: "NoSchedule"
95-
- key: "node.kubernetes.io/unreachable"
96-
operator: "Exists"
97-
effect: "NoExecute"
98-
tolerationSeconds: 120
99-
- key: "node.kubernetes.io/not-ready"
100-
operator: "Exists"
101-
effect: "NoExecute"
102-
tolerationSeconds: 120
93+
- effect: NoSchedule
94+
key: node-role.kubernetes.io/master
95+
operator: Exists
96+
- effect: NoExecute
97+
key: node.kubernetes.io/unreachable
98+
operator: Exists
99+
tolerationSeconds: 120
100+
- effect: NoExecute
101+
key: node.kubernetes.io/not-ready
102+
operator: Exists
103+
tolerationSeconds: 120
104+
103105
containers:
104106
- name: packageserver
105107
command:
@@ -123,6 +125,7 @@ data:
123125
scheme: HTTPS
124126
path: /healthz
125127
port: 5443
128+
terminationMessagePolicy: FallbackToLogsOnError
126129
maturity: alpha
127130
version: 0.9.0
128131
apiservicedefinitions:

0 commit comments

Comments
 (0)