Skip to content

Commit 9556780

Browse files
Fix OCP PSA labels for OCP manifests with k8s version
1 parent 6dd1017 commit 9556780

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,16 @@ vendor:
161161
.PHONY: manifests
162162
manifests: ## Generate manifests
163163
OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh
164+
$(MAKE) update-k8s-manifests
165+
166+
# Minor Kubernetes version to build against derived from the client-go dependency version
167+
KUBE_MINOR ?= $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1/')
168+
169+
.PHONY: update-k8s-manifests # HELP Update pod security versions in manifests with Kubernetes version
170+
update-k8s-manifests:
171+
find manifests microshift-manifests -type f -name '*.yaml' -exec \
172+
sed -i.bak -E 's/(pod-security.kubernetes.io\/[a-zA-Z-]+-version:).*/\1 "v$(KUBE_MINOR)"/g' {} +;
173+
find manifests microshift-manifests -type f -name '*.yaml.bak' -delete
164174

165175
.PHONY: generate-manifests
166176
generate-manifests: OLM_VERSION=0.0.1-snapshot

manifests/0000_50_olm_00-namespace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: openshift-operator-lifecycle-manager
55
labels:
66
pod-security.kubernetes.io/enforce: restricted
7-
pod-security.kubernetes.io/enforce-version: "v1.24"
7+
pod-security.kubernetes.io/enforce-version: "v1.32"
88
openshift.io/scc: ""
99
openshift.io/cluster-monitoring: "true"
1010
annotations:
@@ -21,7 +21,7 @@ metadata:
2121
name: openshift-operators
2222
labels:
2323
pod-security.kubernetes.io/enforce: privileged
24-
pod-security.kubernetes.io/enforce-version: "v1.24"
24+
pod-security.kubernetes.io/enforce-version: "v1.32"
2525
openshift.io/scc: ""
2626
annotations:
2727
openshift.io/node-selector: ""

microshift-manifests/0000_50_olm_00-namespace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: openshift-operator-lifecycle-manager
55
labels:
66
pod-security.kubernetes.io/enforce: restricted
7-
pod-security.kubernetes.io/enforce-version: "v1.24"
7+
pod-security.kubernetes.io/enforce-version: "v1.32"
88
openshift.io/scc: ""
99
openshift.io/cluster-monitoring: "true"
1010
annotations:
@@ -21,7 +21,7 @@ metadata:
2121
name: openshift-operators
2222
labels:
2323
pod-security.kubernetes.io/enforce: privileged
24-
pod-security.kubernetes.io/enforce-version: "v1.24"
24+
pod-security.kubernetes.io/enforce-version: "v1.32"
2525
openshift.io/scc: ""
2626
annotations:
2727
openshift.io/node-selector: ""

0 commit comments

Comments
 (0)