Skip to content

Commit 6945742

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #722 from jpeeler/cvo-upgrade
fix(ocp): add csv and deployment for package server
2 parents 9febd60 + 32515c5 commit 6945742

8 files changed

+310
-0
lines changed

‎deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{{ if (.Values.installType) and eq .Values.installType "ocp" }}
2+
# keep in sync with _packageserver.clusterserviceversion.yaml
3+
apiVersion: operators.coreos.com/v1alpha1
4+
kind: ClusterServiceVersion
5+
metadata:
6+
name: packageserver.v{{ .Chart.Version }}
7+
namespace: {{ .Values.namespace }}
8+
spec:
9+
displayName: Package Server
10+
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
11+
minKubeVersion: {{ .Values.minKubeVersion }}
12+
keywords: ['packagemanifests', 'olm', 'packages']
13+
maintainers:
14+
- name: Red Hat
15+
email: [email protected]
16+
provider:
17+
name: Red Hat
18+
links:
19+
- name: Package Server
20+
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
21+
installModes:
22+
- type: OwnNamespace
23+
supported: true
24+
- type: SingleNamespace
25+
supported: true
26+
- type: MultiNamespace
27+
supported: true
28+
- type: AllNamespaces
29+
supported: true
30+
install:
31+
strategy: deployment
32+
spec:
33+
clusterPermissions:
34+
- serviceAccountName: packageserver
35+
rules:
36+
- apiGroups:
37+
- ""
38+
resources:
39+
- configmaps
40+
verbs:
41+
- get
42+
- list
43+
- watch
44+
- apiGroups:
45+
- operators.coreos.com
46+
resources:
47+
- catalogsources
48+
verbs:
49+
- get
50+
- list
51+
- watch
52+
- apiGroups:
53+
- packages.apps.redhat.com
54+
resources:
55+
- packagemanifests
56+
verbs:
57+
- get
58+
- list
59+
deployments:
60+
- name: packageserver
61+
{{- include "packageserver.deployment-spec" . | indent 8 }}
62+
maturity: alpha
63+
version: {{ .Chart.Version }}
64+
apiservicedefinitions:
65+
owned:
66+
- group: packages.apps.redhat.com
67+
version: v1alpha1
68+
kind: PackageManifest
69+
name: packagemanifest
70+
displayName: PackageManifest
71+
description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
72+
deploymentName: packageserver
73+
containerPort: {{ .Values.package.service.internalPort }}
74+
{{ end }}

‎deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{ if (.Values.installType) and eq .Values.installType "ocp" }}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: packageserver
6+
namespace: {{ .Values.namespace }}
7+
labels:
8+
app: packageserver
9+
{{- include "packageserver.deployment-spec" . }}
10+
{{ end }}

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{{- define "packageserver.deployment-spec" }}
2+
spec:
3+
strategy:
4+
type: RollingUpdate
5+
replicas: {{ .Values.package.replicaCount }}
6+
selector:
7+
matchLabels:
8+
app: packageserver
9+
template:
10+
metadata:
11+
labels:
12+
app: packageserver
13+
spec:
14+
serviceAccountName: packageserver
15+
{{- if .Values.olm.nodeSelector }}
16+
nodeSelector:
17+
{{ toYaml .Values.package.nodeSelector | indent 18 }}
18+
{{- end }}
19+
{{- if .Values.olm.tolerations }}
20+
tolerations:
21+
{{ toYaml .Values.package.tolerations | indent 18 }}
22+
{{- end }}
23+
containers:
24+
- name: packageserver
25+
command:
26+
- /bin/package-server
27+
- -v=4
28+
{{- if .Values.watchedNamespaces }}
29+
- --watched-namespaces
30+
- {{ .Values.watchedNamespaces }}
31+
{{- end }}
32+
- --secure-port
33+
- {{ .Values.package.service.internalPort | quote }}
34+
- --global-namespace
35+
- {{ .Values.namespace }}
36+
{{- if .Values.debug }}
37+
- --debug
38+
{{- end }}
39+
{{- if .Values.package.commandArgs }}
40+
- {{ .Values.package.commandArgs }}
41+
{{- end }}
42+
image: {{ .Values.package.image.ref }}
43+
imagePullPolicy: {{ .Values.package.image.pullPolicy }}
44+
ports:
45+
- containerPort: {{ .Values.package.service.internalPort }}
46+
livenessProbe:
47+
httpGet:
48+
scheme: HTTPS
49+
path: /healthz
50+
port: {{ .Values.package.service.internalPort }}
51+
readinessProbe:
52+
httpGet:
53+
scheme: HTTPS
54+
path: /healthz
55+
port: {{ .Values.package.service.internalPort }}
56+
{{- end }}

‎deploy/ocp/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
installType: ocp
12
rbacApiVersion: rbac.authorization.k8s.io
23
namespace: openshift-operator-lifecycle-manager
34
catalog_namespace: openshift-operator-lifecycle-manager

‎deploy/okd/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
installType: okd
12
rbacApiVersion: rbac.authorization.k8s.io
23
namespace: openshift-operator-lifecycle-manager
34
catalog_namespace: openshift-operator-lifecycle-manager

‎deploy/upstream/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
installType: upstream
12
rbacApiVersion: rbac.authorization.k8s.io
23
namespace: olm
34
catalog_namespace: olm

‎manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
2+
apiVersion: operators.coreos.com/v1alpha1
3+
kind: ClusterServiceVersion
4+
metadata:
5+
name: packageserver.v0.8.1
6+
namespace: openshift-operator-lifecycle-manager
7+
spec:
8+
displayName: Package Server
9+
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
10+
minKubeVersion: 1.11.0
11+
keywords: ['packagemanifests', 'olm', 'packages']
12+
maintainers:
13+
- name: Red Hat
14+
email: [email protected]
15+
provider:
16+
name: Red Hat
17+
links:
18+
- name: Package Server
19+
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
20+
installModes:
21+
- type: OwnNamespace
22+
supported: true
23+
- type: SingleNamespace
24+
supported: true
25+
- type: MultiNamespace
26+
supported: true
27+
- type: AllNamespaces
28+
supported: true
29+
install:
30+
strategy: deployment
31+
spec:
32+
clusterPermissions:
33+
- serviceAccountName: packageserver
34+
rules:
35+
- apiGroups:
36+
- ""
37+
resources:
38+
- configmaps
39+
verbs:
40+
- get
41+
- list
42+
- watch
43+
- apiGroups:
44+
- operators.coreos.com
45+
resources:
46+
- catalogsources
47+
verbs:
48+
- get
49+
- list
50+
- watch
51+
- apiGroups:
52+
- packages.apps.redhat.com
53+
resources:
54+
- packagemanifests
55+
verbs:
56+
- get
57+
- list
58+
deployments:
59+
- name: packageserver
60+
spec:
61+
strategy:
62+
type: RollingUpdate
63+
replicas: 2
64+
selector:
65+
matchLabels:
66+
app: packageserver
67+
template:
68+
metadata:
69+
labels:
70+
app: packageserver
71+
spec:
72+
serviceAccountName: packageserver
73+
nodeSelector:
74+
beta.kubernetes.io/os: linux
75+
node-role.kubernetes.io/master: ""
76+
77+
tolerations:
78+
- operator: Exists
79+
80+
containers:
81+
- name: packageserver
82+
command:
83+
- /bin/package-server
84+
- -v=4
85+
- --secure-port
86+
- "5443"
87+
- --global-namespace
88+
- openshift-operator-lifecycle-manager
89+
image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
90+
imagePullPolicy: IfNotPresent
91+
ports:
92+
- containerPort: 5443
93+
livenessProbe:
94+
httpGet:
95+
scheme: HTTPS
96+
path: /healthz
97+
port: 5443
98+
readinessProbe:
99+
httpGet:
100+
scheme: HTTPS
101+
path: /healthz
102+
port: 5443
103+
maturity: alpha
104+
version: 0.8.1
105+
apiservicedefinitions:
106+
owned:
107+
- group: packages.apps.redhat.com
108+
version: v1alpha1
109+
kind: PackageManifest
110+
name: packagemanifest
111+
displayName: PackageManifest
112+
description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
113+
deploymentName: packageserver
114+
containerPort: 5443
115+

‎manifests/0000_50_olm_16-packageserver.deployment.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: packageserver
6+
namespace: openshift-operator-lifecycle-manager
7+
labels:
8+
app: packageserver
9+
spec:
10+
strategy:
11+
type: RollingUpdate
12+
replicas: 2
13+
selector:
14+
matchLabels:
15+
app: packageserver
16+
template:
17+
metadata:
18+
labels:
19+
app: packageserver
20+
spec:
21+
serviceAccountName: packageserver
22+
nodeSelector:
23+
beta.kubernetes.io/os: linux
24+
node-role.kubernetes.io/master: ""
25+
26+
tolerations:
27+
- operator: Exists
28+
29+
containers:
30+
- name: packageserver
31+
command:
32+
- /bin/package-server
33+
- -v=4
34+
- --secure-port
35+
- "5443"
36+
- --global-namespace
37+
- openshift-operator-lifecycle-manager
38+
image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
39+
imagePullPolicy: IfNotPresent
40+
ports:
41+
- containerPort: 5443
42+
livenessProbe:
43+
httpGet:
44+
scheme: HTTPS
45+
path: /healthz
46+
port: 5443
47+
readinessProbe:
48+
httpGet:
49+
scheme: HTTPS
50+
path: /healthz
51+
port: 5443
52+

0 commit comments

Comments
 (0)