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

fix(calico-3.29.yaml): Disable the calico-apiserver 3.29.2 when Validating Admission Policy checks until upstream tigrea operator adds the required rules #43188

Merged
merged 1 commit into from
Feb 20, 2025
Merged

fix(calico-3.29.yaml): Disable the calico-apiserver 3.29.2 when Validating Admission Policy checks until upstream tigrea operator adds the required rules #43188

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
11 changes: 10 additions & 1 deletion calico-3.29.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: calico-3.29
version: "3.29.2"
epoch: 0
epoch: 1
description: "Cloud native networking and network security"
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -65,6 +65,15 @@ pipeline:
repository: https://github.com/projectcalico/calico
tag: v${{package.version}}
expected-commit: c29210835f7a2795d0791974602c8e1c625c8ca1
# Because we are using tigera-operator during image test we are reliant on tigera-operator setting
# up all the required rbac rules that are needed for calico-apiserver to run. Currently it does not and
# this is a temporary solution until https://github.com/tigera/operator/issues/3780 is resolved upstream with a new
# release of tigera-operator. This issue was highlighed in calico-apiserver 3.29.2 when Validating Admission Policy
# became enabled by default. This patch disables the Validating Admission Policy in calico-apiserver until
# the issue is resolved.
- uses: patch
with:
patches: calico-apiserver-disable-validating-admission-policy.patch
- working-directory: felix
pipeline:
# Equivalent to target: "build-bpf"
Expand Down
13 changes: 13 additions & 0 deletions calico-3.29/calico-apiserver-disable-validating-admission-policy.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/apiserver/cmd/apiserver/server/options.go b/apiserver/cmd/apiserver/server/options.go
index 3701a9659..f8637cff6 100644
--- a/apiserver/cmd/apiserver/server/options.go
+++ b/apiserver/cmd/apiserver/server/options.go
@@ -68,7 +68,7 @@ func (o *CalicoServerOptions) addFlags(flags *pflag.FlagSet) {
"If true, prints swagger to stdout and exits.")
flags.StringVar(&o.SwaggerFilePath, "swagger-file-path", "./",
"If print-swagger is set true, then write swagger.json to location specified. Default is current directory.")
- flags.BoolVar(&o.EnableValidatingAdmissionPolicy, "enable-validating-admission-policy", true,
+ flags.BoolVar(&o.EnableValidatingAdmissionPolicy, "enable-validating-admission-policy", false,
"If true, establishes watches for ValidatingAdmissionPolicy at startup.")
}

Loading