Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bf22f4d

Browse files
committedFeb 25, 2025·
fix: update PSA versions to match Kubernetes API version
In this commit, a new Makefile target `update-k8s-values` was created to automatically update the `pod-security.kubernetes.io/*-version` values (`enforceVersion`, `auditVersion`, `warnVersion`) in the Helm chart's `values.yaml` file. These values now align with the Kubernetes API version defined in `go.mod`, instead of using `latest`. This ensures better compatibility and avoids issues with unsupported versions in Kubernetes PSA.
1 parent 59bfe7f commit bf22f4d

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed
 

Diff for: ‎Makefile

+12-2
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,13 @@ e2e-local: e2e-build kind-create deploy e2e
276276
#SECTION Code Generation
277277

278278
.PHONY: gen-all #HELP Update OLM API, generate code and mocks
279-
gen-all: manifests codegen mockgen
279+
gen-all: manifests codegen update-k8s-values mockgen
280+
281+
.PHONY: update-k8s-values #HELP Update Helm Chart values with Kubernetes version
282+
update-k8s-values:
283+
sed -i '' -E 's/^( *enforceVersion:).*/\1 $(KUBE_MINOR)/' deploy/chart/values.yaml
284+
sed -i '' -E 's/^( *auditVersion:).*/\1 $(KUBE_MINOR)/' deploy/chart/values.yaml
285+
sed -i '' -E 's/^( *warnVersion:).*/\1 $(KUBE_MINOR)/' deploy/chart/values.yaml
280286

281287
.PHONY: manifests
282288
manifests: vendor #HELP Copy OLM API CRD manifests to deploy/chart/crds
@@ -313,8 +319,12 @@ verify-mockgen: mockgen #HELP Check mocks are up to date
313319
verify-manifests: manifests #HELP Check CRD manifests are up to date
314320
$(MAKE) diff
315321

322+
.PHONY: verify-update-k8s-values
323+
verify-update-k8s-values: update-k8s-values #HELP Check if Helm Chart values are updated with k8s version
324+
$(MAKE) diff
325+
316326
.PHONY: verify
317-
verify: vendor verify-codegen verify-mockgen verify-manifests #HELP Run all verification checks
327+
verify: vendor verify-codegen verify-mockgen verify-manifests verify-update-k8s-values #HELP Run all verification checks
318328
$(MAKE) diff
319329

320330
#SECTION Release

Diff for: ‎deploy/chart/values.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ namespace: operator-lifecycle-manager
33
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
44
namespace_psa:
55
enforceLevel: baseline
6-
enforceVersion: latest
6+
enforceVersion: 1.32
77
auditLevel: restricted
8-
auditVersion: latest
8+
auditVersion: 1.32
99
warnLevel: restricted
10-
warnVersion: latest
10+
warnVersion: 1.32
1111
catalog_namespace: operator-lifecycle-manager
1212
operator_namespace: operators
1313
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
1414
operator_namespace_psa:
1515
enforceLevel: baseline
16-
enforceVersion: latest
16+
enforceVersion: 1.32
1717
minKubeVersion: 1.11.0
1818
writeStatusName: '""'
1919
imagestream: false

0 commit comments

Comments
 (0)
Please sign in to comment.