Skip to content

Commit 5fe3dc3

Browse files
camilamacedo86ci-robot
authored and
ci-robot
committed
Revert "fix: update PSA versions to match Kubernetes API version (#3524)" (#3530)
This reverts commit efe3a9ac2e3358cdcaff03accea1e2ce96cd0d3f. Upstream-repository: operator-lifecycle-manager Upstream-commit: 459c1f4a24455b452e93472d6f9c28ee4ce5b92b
1 parent 3229277 commit 5fe3dc3

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

staging/operator-lifecycle-manager/Makefile

+2-13
Original file line numberDiff line numberDiff line change
@@ -276,14 +276,7 @@ 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 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.bak -E 's/^( *enforceVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
284-
sed -i.bak -E 's/^( *auditVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
285-
sed -i.bak -E 's/^( *warnVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
286-
rm deploy/chart/values.yaml.bak
279+
gen-all: manifests codegen mockgen
287280

288281
.PHONY: manifests
289282
manifests: vendor #HELP Copy OLM API CRD manifests to deploy/chart/crds
@@ -320,12 +313,8 @@ verify-mockgen: mockgen #HELP Check mocks are up to date
320313
verify-manifests: manifests #HELP Check CRD manifests are up to date
321314
$(MAKE) diff
322315

323-
.PHONY: verify-update-k8s-values
324-
verify-update-k8s-values: update-k8s-values #HELP Check if Helm Chart values are updated with k8s version
325-
$(MAKE) diff
326-
327316
.PHONY: verify
328-
verify: vendor verify-codegen verify-mockgen verify-manifests verify-update-k8s-values #HELP Run all verification checks
317+
verify: vendor verify-codegen verify-mockgen verify-manifests #HELP Run all verification checks
329318
$(MAKE) diff
330319

331320
#SECTION Release

staging/operator-lifecycle-manager/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: "v1.32"
6+
enforceVersion: latest
77
auditLevel: restricted
8-
auditVersion: "v1.32"
8+
auditVersion: latest
99
warnLevel: restricted
10-
warnVersion: "v1.32"
10+
warnVersion: latest
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: "v1.32"
16+
enforceVersion: latest
1717
minKubeVersion: 1.11.0
1818
writeStatusName: '""'
1919
imagestream: false

0 commit comments

Comments
 (0)