Skip to content

Commit b80e10d

Browse files
github-actions[bot]hypery2k
github-actions[bot]
authored and
hypery2k
committed
chore: Update OLM chart
https://github.com/CloudTooling/k8s-olm/actions/runs/19274210291
1 parent f0273b7 commit b80e10d

8 files changed

+105
-33
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.36.0
4+
version: 0.38.0
55
annotations:
66
artifacthub.io/links: |
77
- name: Helm Chart

‎chart/README.md‎

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

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

55
Kubernetes Chart for Operator Lifecycle Manager
66

@@ -10,7 +10,7 @@ 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.36.0"` | |
13+
| catalog.image.ref | string | `"quay.io/operator-framework/olm:v0.38.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` | |
@@ -19,14 +19,15 @@ Kubernetes Chart for Operator Lifecycle Manager
1919
| catalog.service.externalPort | string | `"metrics"` | |
2020
| catalog.service.internalPort | int | `8080` | |
2121
| catalog.service.internalPortHttps | int | `8443` | |
22+
| catalog.service.name | string | `"catalog-operator-metrics"` | |
2223
| catalog.setWorkloadUserID | bool | `true` | |
2324
| catalogGrpcPodPort | int | `50051` | |
2425
| catalog_namespace | string | `"operator-lifecycle-manager"` | |
2526
| certManager.certificate.extraDnsNames | list | `[]` | |
2627
| certManager.certificate.extraIpAddresses | list | `[]` | |
2728
| certManager.certificate.name | string | `"olm-cert"` | |
2829
| certManager.certificate.secretName | string | `"olm-cert"` | |
29-
| certManager.enabled | bool | `true` | |
30+
| certManager.enabled | bool | `false` | |
3031
| certManager.issuer.ca.secretName | string | `""` | |
3132
| certManager.issuer.name | string | `"olm-ca-issuer"` | |
3233
| certManager.issuer.selfSigned | bool | `true` | |
@@ -52,19 +53,20 @@ Kubernetes Chart for Operator Lifecycle Manager
5253
| networkPolicy.metrics.ports[0].port | string | `"metrics"` | |
5354
| networkPolicy.metrics.ports[0].protocol | string | `"TCP"` | |
5455
| olm.image.pullPolicy | string | `"Always"` | |
55-
| olm.image.ref | string | `"quay.io/operator-framework/olm:v0.36.0"` | |
56+
| olm.image.ref | string | `"quay.io/operator-framework/olm:v0.38.0"` | |
5657
| olm.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
5758
| olm.replicaCount | int | `1` | |
5859
| olm.resources.requests.cpu | string | `"10m"` | |
5960
| olm.resources.requests.memory | string | `"160Mi"` | |
6061
| olm.service.externalPort | string | `"metrics"` | |
6162
| olm.service.internalPort | int | `8080` | |
6263
| olm.service.internalPortHttps | int | `8443` | |
64+
| olm.service.name | string | `"olm-operator-metrics"` | |
6365
| operator_namespace | string | `"operators"` | |
6466
| operator_namespace_psa.enforceLevel | string | `"baseline"` | |
6567
| operator_namespace_psa.enforceVersion | string | `"latest"` | |
6668
| package.image.pullPolicy | string | `"Always"` | |
67-
| package.image.ref | string | `"quay.io/operator-framework/olm:v0.36.0"` | |
69+
| package.image.ref | string | `"quay.io/operator-framework/olm:v0.38.0"` | |
6870
| package.maxSurge | int | `1` | |
6971
| package.maxUnavailable | int | `1` | |
7072
| package.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
@@ -73,6 +75,9 @@ Kubernetes Chart for Operator Lifecycle Manager
7375
| package.resources.requests.memory | string | `"50Mi"` | |
7476
| package.service.internalPort | int | `5443` | |
7577
| rbacApiVersion | string | `"rbac.authorization.k8s.io"` | |
78+
| serviceCa.catalogOperator.secretName | string | `""` | |
79+
| serviceCa.enabled | bool | `false` | |
80+
| serviceCa.olmOperator.secretName | string | `""` | |
7681
| writeStatusName | string | `"\"\""` | |
7782

7883
----------------------------------------------

‎chart/templates/0000_50_olm_02-olm-operator.serviceaccount.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ rules:
88
verbs: ["watch", "list", "get", "create", "update", "patch", "delete", "deletecollection", "escalate", "bind"]
99
- nonResourceURLs: ["*"]
1010
verbs: ["*"]
11+
- apiGroups:
12+
- authentication.k8s.io
13+
resources:
14+
- tokenreviews
15+
verbs:
16+
- create
17+
- apiGroups:
18+
- authorization.k8s.io
19+
resources:
20+
- subjectaccessreviews
21+
verbs:
22+
- create
1123
---
1224
kind: ServiceAccount
1325
apiVersion: v1

‎chart/templates/0000_50_olm_03-services.yaml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
1-
{{ if .Values.monitoring.enabled }}
1+
{{- if or .Values.monitoring.enabled .Values.serviceCa.enabled }}
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: olm-operator-metrics
5+
name: {{ .Values.olm.service.name }}
66
namespace: {{ .Values.namespace }}
7+
{{- if .Values.serviceCa.enabled }}
78
annotations:
8-
service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
9+
service.alpha.openshift.io/serving-cert-secret-name: {{ .Values.serviceCa.olmOperator.secretName }}
10+
{{- end }}
911
labels:
1012
app: olm-operator
1113
spec:
1214
type: ClusterIP
1315
ports:
1416
- name: https-metrics
15-
port: {{ .Values.olm.service.externalPort }}
17+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.externalPort }}{{ end }}
1618
protocol: TCP
17-
targetPort: {{ .Values.olm.service.internalPort }}
19+
targetPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
1820
selector:
1921
app: olm-operator
2022
---
2123
apiVersion: v1
2224
kind: Service
2325
metadata:
24-
name: catalog-operator-metrics
26+
name: {{ .Values.catalog.service.name }}
2527
namespace: {{ .Values.namespace }}
28+
{{- if .Values.serviceCa.enabled }}
2629
annotations:
27-
service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
30+
service.alpha.openshift.io/serving-cert-secret-name: {{ .Values.serviceCa.catalogOperator.secretName }}
31+
{{- end }}
2832
labels:
2933
app: catalog-operator
3034
spec:
3135
type: ClusterIP
3236
ports:
3337
- name: https-metrics
34-
port: {{ .Values.catalog.service.externalPort }}
38+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.externalPort }}{{ end }}
3539
protocol: TCP
36-
targetPort: {{ .Values.catalog.service.internalPort }}
40+
targetPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
3741
selector:
3842
app: catalog-operator
3943
{{ end }}

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ spec:
3030
- name: profile-collector-cert
3131
secret:
3232
secretName: {{ .Values.certManager.certificate.secretName }}
33+
{{- else if .Values.serviceCa.enabled }}
34+
- name: srv-cert
35+
secret:
36+
secretName: {{ .Values.serviceCa.olmOperator.secretName }}
37+
- name: profile-collector-cert
38+
secret:
39+
secretName: {{ .Values.serviceCa.olmOperator.secretName }}
3340
{{- end }}
3441
- name: tmpfs
3542
emptyDir: {}
@@ -41,7 +48,7 @@ spec:
4148
capabilities:
4249
drop: [ "ALL" ]
4350
volumeMounts:
44-
{{- if .Values.certManager.enabled }}
51+
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
4552
- name: srv-cert
4653
mountPath: "/srv-cert"
4754
readOnly: true
@@ -74,7 +81,7 @@ spec:
7481
- --writePackageServerStatusName
7582
- {{ .Values.writePackageServerStatusName }}
7683
{{- end }}
77-
{{- if .Values.certManager.enabled }}
84+
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
7885
- --tls-cert
7986
- /srv-cert/tls.crt
8087
- --tls-key
@@ -85,18 +92,18 @@ spec:
8592
image: {{ .Values.olm.image.ref }}
8693
imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
8794
ports:
88-
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
95+
- containerPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
8996
name: metrics
9097
livenessProbe:
9198
httpGet:
9299
path: /healthz
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 }}
100+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
101+
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
95102
readinessProbe:
96103
httpGet:
97104
path: /healthz
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 }}
105+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
106+
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
100107
terminationMessagePolicy: FallbackToLogsOnError
101108
env:
102109
- name: OPERATOR_NAMESPACE

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ spec:
3030
- name: profile-collector-cert
3131
secret:
3232
secretName: {{ .Values.certManager.certificate.secretName }}
33+
{{- else if .Values.serviceCa.enabled }}
34+
- name: srv-cert
35+
secret:
36+
secretName: {{ .Values.serviceCa.catalogOperator.secretName }}
37+
- name: profile-collector-cert
38+
secret:
39+
secretName: {{ .Values.serviceCa.catalogOperator.secretName }}
3340
{{- end }}
3441
- name: tmpfs
3542
emptyDir: {}
@@ -41,7 +48,7 @@ spec:
4148
capabilities:
4249
drop: [ "ALL" ]
4350
volumeMounts:
44-
{{- if .Values.certManager.enabled }}
51+
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
4552
- name: srv-cert
4653
mountPath: "/srv-cert"
4754
readOnly: true
@@ -71,7 +78,7 @@ spec:
7178
- --writeStatusName
7279
- {{ .Values.writeStatusNameCatalog }}
7380
{{- end }}
74-
{{- if .Values.certManager.enabled }}
81+
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
7582
- --tls-cert
7683
- /srv-cert/tls.crt
7784
- --tls-key
@@ -92,18 +99,18 @@ spec:
9299
{{- end }}
93100
imagePullPolicy: {{ .Values.catalog.image.pullPolicy }}
94101
ports:
95-
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
102+
- containerPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
96103
name: metrics
97104
livenessProbe:
98105
httpGet:
99106
path: /healthz
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 }}
107+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
108+
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
102109
readinessProbe:
103110
httpGet:
104111
path: /healthz
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 }}
112+
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
113+
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
107114
terminationMessagePolicy: FallbackToLogsOnError
108115
{{- if .Values.catalog.resources }}
109116
resources:

‎chart/templates/0000_90_olm_00-service-monitor.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,27 @@ rules:
8787
- get
8888
- list
8989
- watch
90+
---
91+
apiVersion: rbac.authorization.k8s.io/v1
92+
kind: ClusterRole
93+
metadata:
94+
name: operator-lifecycle-manager-metrics-reader
95+
rules:
96+
- nonResourceURLs:
97+
- "/metrics"
98+
verbs:
99+
- get
100+
---
101+
apiVersion: rbac.authorization.k8s.io/v1
102+
kind: ClusterRoleBinding
103+
metadata:
104+
name: operator-lifecycle-manager-metrics-reader
105+
roleRef:
106+
apiGroup: rbac.authorization.k8s.io
107+
kind: ClusterRole
108+
name: operator-lifecycle-manager-metrics-reader
109+
subjects:
110+
- kind: ServiceAccount
111+
name: prometheus-k8s
112+
namespace: {{ .Values.monitoring.namespace }}
90113
{{ end }}

‎chart/values.yaml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ catalogGrpcPodPort: 50051
2424
olm:
2525
replicaCount: 1
2626
image:
27-
ref: quay.io/operator-framework/olm:v0.36.0
27+
ref: quay.io/operator-framework/olm:v0.38.0
2828
pullPolicy: Always
2929
service:
30+
name: olm-operator-metrics
3031
internalPort: 8080
3132
internalPortHttps: 8443
3233
externalPort: metrics
@@ -43,9 +44,10 @@ catalog:
4344
commandArgs: --configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
4445
opmImageArgs: --opmImage=quay.io/operator-framework/opm:latest
4546
image:
46-
ref: quay.io/operator-framework/olm:v0.36.0
47+
ref: quay.io/operator-framework/olm:v0.38.0
4748
pullPolicy: Always
4849
service:
50+
name: catalog-operator-metrics
4951
internalPort: 8080
5052
internalPortHttps: 8443
5153
externalPort: metrics
@@ -61,7 +63,7 @@ package:
6163
maxUnavailable: 1
6264
maxSurge: 1
6365
image:
64-
ref: quay.io/operator-framework/olm:v0.36.0
66+
ref: quay.io/operator-framework/olm:v0.38.0
6567
pullPolicy: Always
6668
service:
6769
internalPort: 5443
@@ -77,7 +79,7 @@ monitoring:
7779
namespace: monitoring
7880

7981
certManager:
80-
enabled: true
82+
enabled: false
8183
issuer:
8284
name: olm-ca-issuer
8385
selfSigned: true
@@ -89,6 +91,18 @@ certManager:
8991
extraDnsNames: []
9092
extraIpAddresses: []
9193

94+
# OpenShift service-ca configuration
95+
# When enabled, uses OpenShift service-ca-operator for certificate management
96+
# This is mutually exclusive with certManager - only one should be enabled
97+
serviceCa:
98+
enabled: false
99+
# Secret names are left empty in upstream, to be filled by downstream values.yaml
100+
# Service names are taken from olm.service.name and catalog.service.name
101+
olmOperator:
102+
secretName: ""
103+
catalogOperator:
104+
secretName: ""
105+
92106
networkPolicy:
93107
dns:
94108
ports:

0 commit comments

Comments
 (0)