Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "🐛 (fix): update PSA versions to match Kubernetes API version" #3530

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Revert "🐛 (fix): update PSA versions to match Kubernetes API version" #3530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,7 @@ e2e-local: e2e-build kind-create deploy e2e
#SECTION Code Generation

.PHONY: gen-all #HELP Update OLM API, generate code and mocks
gen-all: manifests codegen update-k8s-values mockgen

.PHONY: update-k8s-values #HELP Update Helm Chart values with Kubernetes version
update-k8s-values:
sed -i.bak -E 's/^( *enforceVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
sed -i.bak -E 's/^( *auditVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
sed -i.bak -E 's/^( *warnVersion:).*/\1 "v$(KUBE_MINOR)"/' deploy/chart/values.yaml
rm deploy/chart/values.yaml.bak
gen-all: manifests codegen mockgen

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

.PHONY: verify-update-k8s-values
verify-update-k8s-values: update-k8s-values #HELP Check if Helm Chart values are updated with k8s version
$(MAKE) diff

.PHONY: verify
verify: vendor verify-codegen verify-mockgen verify-manifests verify-update-k8s-values #HELP Run all verification checks
verify: vendor verify-codegen verify-mockgen verify-manifests #HELP Run all verification checks
$(MAKE) diff

#SECTION Release
Expand Down
8 changes: 4 additions & 4 deletions deploy/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ namespace: operator-lifecycle-manager
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
namespace_psa:
enforceLevel: baseline
enforceVersion: "v1.32"
enforceVersion: latest
auditLevel: restricted
auditVersion: "v1.32"
auditVersion: latest
warnLevel: restricted
warnVersion: "v1.32"
warnVersion: latest
catalog_namespace: operator-lifecycle-manager
operator_namespace: operators
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
operator_namespace_psa:
enforceLevel: baseline
enforceVersion: "v1.32"
enforceVersion: latest
minKubeVersion: 1.11.0
writeStatusName: '""'
imagestream: false
Expand Down
Loading