Skip to content

Commit 98e552f

Browse files
committed
manifests,staging: Add default values to the PackageServer CSV and regenerate manifests
Update the staging/operator-lifecycle-manager helm charts for the PackageServer CSV resource and add the defaults for various fields to avoid the CVO hotlooping when attempting to create this resource. These changes were introduced directly into the root list of manifests in openshift#84 and this PR attempts to ensure those changes were also propagated to the helm charts and regenerated to keep the manifest directory in sync.
1 parent f25f670 commit 98e552f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ metadata:
1212
olm.version: 0.17.0
1313
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1414
spec:
15-
cleanup:
16-
enabled: false
17-
customresourcedefinitions: {}
1815
displayName: Package Server
1916
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
2017
minKubeVersion: 1.11.0
@@ -24,6 +21,9 @@ spec:
2421
2522
provider:
2623
name: Red Hat
24+
cleanup:
25+
enabled: false
26+
customResourceDefinitions: {}
2727
links:
2828
- name: Package Server
2929
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
@@ -88,9 +88,9 @@ spec:
8888
metadata:
8989
annotations:
9090
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
91-
creationTimestamp: null
9291
labels:
9392
app: packageserver
93+
creationTimestamp: null
9494
spec:
9595
serviceAccountName: olm-operator-serviceaccount
9696
priorityClassName: "system-cluster-critical"

staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ spec:
2727
2828
provider:
2929
name: Red Hat
30+
cleanup:
31+
enabled: false
32+
customresourcedefinitions: {}
3033
links:
3134
- name: Package Server
3235
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server

staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.deployment-spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
{{- end }}
1818
labels:
1919
app: packageserver
20+
creationTimestamp: null
2021
spec:
2122
serviceAccountName: olm-operator-serviceaccount
2223
{{- if and .Values.installType (eq .Values.installType "ocp") }}
@@ -53,6 +54,7 @@ spec:
5354
imagePullPolicy: {{ .Values.package.image.pullPolicy }}
5455
ports:
5556
- containerPort: {{ .Values.package.service.internalPort }}
57+
protocol: TCP
5658
livenessProbe:
5759
httpGet:
5860
scheme: HTTPS

0 commit comments

Comments
 (0)