Skip to content

Commit ed67ef6

Browse files
hypery2khypery2k
committed
feat(OLM): Update to olm 0.36.0
1 parent 4cba5d1 commit ed67ef6

10 files changed

+674
-103
lines changed

‎chart/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
description: Kubernetes Chart for Operator Lifecycle Manager
33
name: olm
4-
version: 0.35.0
4+
version: 0.36.0
55
annotations:
66
artifacthub.io/links: |
77
- name: Helm Chart

‎chart/README.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# olm
22

3-
![Version: 0.35.0](https://img.shields.io/badge/Version-0.35.0-informational?style=flat-square)
3+
![Version: 0.36.0](https://img.shields.io/badge/Version-0.36.0-informational?style=flat-square)
44

55
Kubernetes Chart for Operator Lifecycle Manager
66

@@ -10,17 +10,26 @@ Kubernetes Chart for Operator Lifecycle Manager
1010
|-----|------|---------|-------------|
1111
| catalog.commandArgs | string | `"--configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest"` | |
1212
| catalog.image.pullPolicy | string | `"Always"` | |
13-
| catalog.image.ref | string | `"quay.io/operator-framework/olm:v0.35.0"` | |
13+
| catalog.image.ref | string | `"quay.io/operator-framework/olm:v0.36.0"` | |
1414
| catalog.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
1515
| catalog.opmImageArgs | string | `"--opmImage=quay.io/operator-framework/opm:latest"` | |
1616
| catalog.replicaCount | int | `1` | |
1717
| catalog.resources.requests.cpu | string | `"10m"` | |
1818
| catalog.resources.requests.memory | string | `"80Mi"` | |
1919
| catalog.service.externalPort | string | `"metrics"` | |
2020
| catalog.service.internalPort | int | `8080` | |
21+
| catalog.service.internalPortHttps | int | `8443` | |
2122
| catalog.setWorkloadUserID | bool | `true` | |
2223
| catalogGrpcPodPort | int | `50051` | |
2324
| catalog_namespace | string | `"operator-lifecycle-manager"` | |
25+
| certManager.certificate.extraDnsNames | list | `[]` | |
26+
| certManager.certificate.extraIpAddresses | list | `[]` | |
27+
| certManager.certificate.name | string | `"olm-cert"` | |
28+
| certManager.certificate.secretName | string | `"olm-cert"` | |
29+
| certManager.enabled | bool | `true` | |
30+
| certManager.issuer.ca.secretName | string | `""` | |
31+
| certManager.issuer.name | string | `"olm-ca-issuer"` | |
32+
| certManager.issuer.selfSigned | bool | `true` | |
2433
| debug | bool | `false` | |
2534
| imagestream | bool | `false` | |
2635
| installType | string | `"upstream"` | |
@@ -43,18 +52,19 @@ Kubernetes Chart for Operator Lifecycle Manager
4352
| networkPolicy.metrics.ports[0].port | string | `"metrics"` | |
4453
| networkPolicy.metrics.ports[0].protocol | string | `"TCP"` | |
4554
| olm.image.pullPolicy | string | `"Always"` | |
46-
| olm.image.ref | string | `"quay.io/operator-framework/olm:v0.35.0"` | |
55+
| olm.image.ref | string | `"quay.io/operator-framework/olm:v0.36.0"` | |
4756
| olm.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
4857
| olm.replicaCount | int | `1` | |
4958
| olm.resources.requests.cpu | string | `"10m"` | |
5059
| olm.resources.requests.memory | string | `"160Mi"` | |
5160
| olm.service.externalPort | string | `"metrics"` | |
5261
| olm.service.internalPort | int | `8080` | |
62+
| olm.service.internalPortHttps | int | `8443` | |
5363
| operator_namespace | string | `"operators"` | |
5464
| operator_namespace_psa.enforceLevel | string | `"baseline"` | |
5565
| operator_namespace_psa.enforceVersion | string | `"latest"` | |
5666
| package.image.pullPolicy | string | `"Always"` | |
57-
| package.image.ref | string | `"quay.io/operator-framework/olm:v0.35.0"` | |
67+
| package.image.ref | string | `"quay.io/operator-framework/olm:v0.36.0"` | |
5868
| package.maxSurge | int | `1` | |
5969
| package.maxUnavailable | int | `1` | |
6070
| package.nodeSelector."kubernetes.io/os" | string | `"linux"` | |

‎chart/crds/0000_50_olm_00-catalogsources.crd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,8 @@ spec:
631631
most preferred is the one with the greatest sum of weights, i.e.
632632
for each node that meets all of the scheduling requirements (resource
633633
request, requiredDuringScheduling anti-affinity expressions, etc.),
634-
compute a sum by iterating through the elements of this field and adding
635-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
634+
compute a sum by iterating through the elements of this field and subtracting
635+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
636636
node(s) with the highest sum are the most preferred.
637637
type: array
638638
items:

‎chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml‎

Lines changed: 417 additions & 39 deletions
Large diffs are not rendered by default.

‎chart/crds/0000_50_olm_00-subscriptions.crd.yaml‎

Lines changed: 154 additions & 16 deletions
Large diffs are not rendered by default.

‎chart/templates/0000_50_olm_04-cert-manager.yaml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{{- if .Values.certManager.enabled }}
2+
---
3+
apiVersion: cert-manager.io/v1
4+
kind: Issuer
5+
metadata:
6+
name: {{ .Values.certManager.issuer.name }}
7+
namespace: {{ .Values.namespace }}
8+
spec:
9+
{{- if .Values.certManager.issuer.selfSigned }}
10+
selfSigned: {}
11+
{{- else if .Values.certManager.issuer.ca }}
12+
ca:
13+
secretName: {{ .Values.certManager.issuer.ca.secretName }}
14+
{{- end }}
15+
---
16+
apiVersion: cert-manager.io/v1
17+
kind: Certificate
18+
metadata:
19+
name: {{ .Values.certManager.certificate.name }}
20+
namespace: {{ .Values.namespace }}
21+
spec:
22+
secretName: {{ .Values.certManager.certificate.secretName }}
23+
isCA: false
24+
usages:
25+
- server auth
26+
- client auth
27+
dnsNames:
28+
- localhost
29+
- catalog-operator.{{ .Values.namespace }}.svc
30+
- catalog-operator.{{ .Values.namespace }}.svc.cluster.local
31+
- olm-operator.{{ .Values.namespace }}.svc
32+
- olm-operator.{{ .Values.namespace }}.svc.cluster.local
33+
{{- range .Values.certManager.certificate.extraDnsNames }}
34+
- {{ . }}
35+
{{- end }}
36+
ipAddresses:
37+
- 127.0.0.1
38+
{{- range .Values.certManager.certificate.extraIpAddresses }}
39+
- {{ . }}
40+
{{- end }}
41+
issuerRef:
42+
name: {{ .Values.certManager.issuer.name }}
43+
kind: Issuer
44+
group: cert-manager.io
45+
{{- end }}
46+

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ spec:
2222
seccompProfile:
2323
type: RuntimeDefault
2424
serviceAccountName: olm-operator-serviceaccount
25-
volumes:
26-
{{- if .Values.olm.tlsSecret }}
25+
volumes:
26+
{{- if .Values.certManager.enabled }}
2727
- name: srv-cert
2828
secret:
29-
secretName: {{ .Values.olm.tlsSecret }}
30-
{{- end }}
31-
{{- if .Values.olm.clientCASecret }}
29+
secretName: {{ .Values.certManager.certificate.secretName }}
3230
- name: profile-collector-cert
3331
secret:
34-
secretName: {{ .Values.olm.clientCASecret }}
32+
secretName: {{ .Values.certManager.certificate.secretName }}
3533
{{- end }}
3634
- name: tmpfs
3735
emptyDir: {}
@@ -43,12 +41,10 @@ spec:
4341
capabilities:
4442
drop: [ "ALL" ]
4543
volumeMounts:
46-
{{- if .Values.olm.tlsSecret }}
44+
{{- if .Values.certManager.enabled }}
4745
- name: srv-cert
4846
mountPath: "/srv-cert"
4947
readOnly: true
50-
{{- end }}
51-
{{- if .Values.olm.clientCASecret }}
5248
- name: profile-collector-cert
5349
mountPath: "/profile-collector-cert"
5450
readOnly: true
@@ -78,31 +74,29 @@ spec:
7874
- --writePackageServerStatusName
7975
- {{ .Values.writePackageServerStatusName }}
8076
{{- end }}
81-
{{- if .Values.olm.tlsSecret }}
77+
{{- if .Values.certManager.enabled }}
8278
- --tls-cert
8379
- /srv-cert/tls.crt
8480
- --tls-key
8581
- /srv-cert/tls.key
86-
{{- end }}
87-
{{- if .Values.olm.clientCASecret }}
8882
- --client-ca
8983
- /profile-collector-cert/tls.crt
9084
{{- end }}
9185
image: {{ .Values.olm.image.ref }}
9286
imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
9387
ports:
94-
- containerPort: {{ .Values.olm.service.internalPort }}
88+
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
9589
name: metrics
9690
livenessProbe:
9791
httpGet:
9892
path: /healthz
99-
port: {{ .Values.olm.service.internalPort }}
100-
scheme: {{ if .Values.olm.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
93+
port: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
94+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
10195
readinessProbe:
10296
httpGet:
10397
path: /healthz
104-
port: {{ .Values.olm.service.internalPort }}
105-
scheme: {{ if .Values.olm.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
98+
port: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
99+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
106100
terminationMessagePolicy: FallbackToLogsOnError
107101
env:
108102
- name: OPERATOR_NAMESPACE

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ spec:
2323
type: RuntimeDefault
2424
serviceAccountName: olm-operator-serviceaccount
2525
volumes:
26-
{{- if .Values.catalog.tlsSecret }}
26+
{{- if .Values.certManager.enabled }}
2727
- name: srv-cert
2828
secret:
29-
secretName: {{ .Values.catalog.tlsSecret }}
30-
{{- end }}
31-
{{- if .Values.catalog.clientCASecret }}
29+
secretName: {{ .Values.certManager.certificate.secretName }}
3230
- name: profile-collector-cert
3331
secret:
34-
secretName: {{ .Values.catalog.clientCASecret }}
32+
secretName: {{ .Values.certManager.certificate.secretName }}
3533
{{- end }}
3634
- name: tmpfs
3735
emptyDir: {}
@@ -43,12 +41,10 @@ spec:
4341
capabilities:
4442
drop: [ "ALL" ]
4543
volumeMounts:
46-
{{- if .Values.catalog.tlsSecret }}
44+
{{- if .Values.certManager.enabled }}
4745
- name: srv-cert
4846
mountPath: "/srv-cert"
4947
readOnly: true
50-
{{- end }}
51-
{{- if .Values.catalog.clientCASecret }}
5248
- name: profile-collector-cert
5349
mountPath: "/profile-collector-cert"
5450
readOnly: true
@@ -75,13 +71,11 @@ spec:
7571
- --writeStatusName
7672
- {{ .Values.writeStatusNameCatalog }}
7773
{{- end }}
78-
{{- if .Values.catalog.tlsSecret }}
74+
{{- if .Values.certManager.enabled }}
7975
- --tls-cert
8076
- /srv-cert/tls.crt
8177
- --tls-key
8278
- /srv-cert/tls.key
83-
{{- end }}
84-
{{- if .Values.catalog.clientCASecret }}
8579
- --client-ca
8680
- /profile-collector-cert/tls.crt
8781
{{- end }}
@@ -98,18 +92,18 @@ spec:
9892
{{- end }}
9993
imagePullPolicy: {{ .Values.catalog.image.pullPolicy }}
10094
ports:
101-
- containerPort: {{ .Values.olm.service.internalPort }}
95+
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
10296
name: metrics
10397
livenessProbe:
10498
httpGet:
10599
path: /healthz
106-
port: {{ .Values.catalog.service.internalPort }}
107-
scheme: {{ if .Values.catalog.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
100+
port: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
101+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
108102
readinessProbe:
109103
httpGet:
110104
path: /healthz
111-
port: {{ .Values.catalog.service.internalPort }}
112-
scheme: {{ if .Values.catalog.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
105+
port: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
106+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
113107
terminationMessagePolicy: FallbackToLogsOnError
114108
{{- if .Values.catalog.resources }}
115109
resources:

‎chart/templates/_helpers.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
1313
{{- define "fullname" -}}
1414
{{- $name := default .Chart.Name .Values.nameOverride -}}
1515
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
16-
{{- end -}}
16+
{{- end -}}

‎chart/values.yaml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ catalogGrpcPodPort: 50051
2424
olm:
2525
replicaCount: 1
2626
image:
27-
ref: quay.io/operator-framework/olm:v0.35.0
27+
ref: quay.io/operator-framework/olm:v0.36.0
2828
pullPolicy: Always
2929
service:
3030
internalPort: 8080
31+
internalPortHttps: 8443
3132
externalPort: metrics
32-
# tlsSecret: olm-operator-serving-cert
33-
# clientCASecret: pprof-serving-cert
3433
nodeSelector:
3534
kubernetes.io/os: linux
3635
resources:
@@ -44,13 +43,12 @@ catalog:
4443
commandArgs: --configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
4544
opmImageArgs: --opmImage=quay.io/operator-framework/opm:latest
4645
image:
47-
ref: quay.io/operator-framework/olm:v0.35.0
46+
ref: quay.io/operator-framework/olm:v0.36.0
4847
pullPolicy: Always
4948
service:
5049
internalPort: 8080
50+
internalPortHttps: 8443
5151
externalPort: metrics
52-
# tlsSecret: catalog-operator-serving-cert
53-
# clientCASecret: pprof-serving-cert
5452
nodeSelector:
5553
kubernetes.io/os: linux
5654
resources:
@@ -63,7 +61,7 @@ package:
6361
maxUnavailable: 1
6462
maxSurge: 1
6563
image:
66-
ref: quay.io/operator-framework/olm:v0.35.0
64+
ref: quay.io/operator-framework/olm:v0.36.0
6765
pullPolicy: Always
6866
service:
6967
internalPort: 5443
@@ -78,6 +76,19 @@ monitoring:
7876
enabled: false
7977
namespace: monitoring
8078

79+
certManager:
80+
enabled: true
81+
issuer:
82+
name: olm-ca-issuer
83+
selfSigned: true
84+
ca:
85+
secretName: ""
86+
certificate:
87+
name: olm-cert
88+
secretName: olm-cert
89+
extraDnsNames: []
90+
extraIpAddresses: []
91+
8192
networkPolicy:
8293
dns:
8394
ports:

0 commit comments

Comments
 (0)