Skip to content

Commit e73878d

Browse files
committed
(deploy) add cluster operator for package server
1 parent 448ed54 commit e73878d

15 files changed

+36
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ spec:
4040
- -writeStatusName
4141
- {{ .Values.writeStatusName }}
4242
{{- end }}
43+
{{- if .Values.writePackageServerStatusName }}
44+
- -writePackageServerStatusName
45+
- {{ .Values.writePackageServerStatusName }}
46+
{{- end }}
4347
{{- if .Values.olm.tlsCertPath }}
4448
- -tls-cert
4549
- {{ .Values.olm.tlsCertPath }}

deploy/chart/templates/0000_50_olm_15-operatorstatus.yaml renamed to deploy/chart/templates/0000_50_olm_99-operatorstatus.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,15 @@ status:
1616
versions:
1717
- name: operator
1818
version: "0.0.1-snapshot"
19+
{{- if .Values.writePackageServerStatusName }}
20+
---
21+
apiVersion: config.openshift.io/v1
22+
kind: ClusterOperator
23+
metadata:
24+
name: {{ .Values.writePackageServerStatusName }}
25+
status:
26+
versions:
27+
- name: operator
28+
version: "0.0.1-snapshot"
29+
{{- end }}
1930
{{- end }}

deploy/chart/templates/_packageserver.clusterserviceversion.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: ClusterServiceVersion
44
metadata:
55
name: packageserver.v{{ .Chart.Version }}
66
namespace: {{ .Values.namespace }}
7+
labels:
8+
{{- if .Values.writePackageServerStatusName }}
9+
olm.clusteroperator.name: {{ .Values.writePackageServerStatusName }}
10+
{{- end }}
711
spec:
812
displayName: Package Server
913
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.

deploy/ocp/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ operator_namespace: openshift-operators
66
imagestream: true
77
writeStatusName: operator-lifecycle-manager
88
writeStatusNameCatalog: operator-lifecycle-manager-catalog
9+
writePackageServerStatusName: operator-lifecycle-manager-packageserver
910
olm:
1011
replicaCount: 1
1112
image:

deploy/upstream/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ catalog_namespace: olm
55
operator_namespace: operators
66
imagestream: false
77
writeStatusName: '""'
8+
writePackageServerStatusName: ""
89
olm:
910
replicaCount: 1
1011
image:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ spec:
2626
args:
2727
- -writeStatusName
2828
- operator-lifecycle-manager
29+
- -writePackageServerStatusName
30+
- operator-lifecycle-manager-packageserver
2931
- -tls-cert
3032
- /var/run/secrets/serving-cert/tls.crt
3133
- -tls-key

0 commit comments

Comments
 (0)