From acd208576f646b7b93ab3d4e39f382495f6f7a19 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 10 May 2024 15:50:26 -0700 Subject: [PATCH] since no longer in backticks, can remove replacing backticks --- hack/update/cilium_version/update_cilium_version.go | 4 ---- pkg/minikube/cni/cilium.go | 3 ++- pkg/minikube/cni/cilium.yaml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hack/update/cilium_version/update_cilium_version.go b/hack/update/cilium_version/update_cilium_version.go index 2f0b55b6e5c6..e929e8ad0e54 100644 --- a/hack/update/cilium_version/update_cilium_version.go +++ b/hack/update/cilium_version/update_cilium_version.go @@ -63,10 +63,6 @@ func main() { re = regexp.MustCompile(`# Source: cilium\/templates\/hubble\/tls-helm\/server-secret\.yaml(\n.*?)+---\n`) yaml = re.ReplaceAllString(yaml, "") - // Replace backticks with single-quotes as the entire YAML is enclosed in backticks and will break - re = regexp.MustCompile("`") - yaml = re.ReplaceAllString(yaml, "'") - // Replace `cluster-pool-ipv4-cidr` with PodSubnet template re = regexp.MustCompile(`10\.0\.0\.0\/8`) yaml = re.ReplaceAllString(yaml, "{{ .PodSubnet }}") diff --git a/pkg/minikube/cni/cilium.go b/pkg/minikube/cni/cilium.go index ba9b464e3348..c0f635b6ca0c 100644 --- a/pkg/minikube/cni/cilium.go +++ b/pkg/minikube/cni/cilium.go @@ -27,10 +27,11 @@ import ( "k8s.io/minikube/pkg/minikube/config" ) +// Generated by running `make update-cilium-version` +// //go:embed cilium.yaml var ciliumYaml string -// Generated by running `make update-cilium-version` var ciliumTmpl = template.Must(template.New("name").Parse(ciliumYaml)) // Cilium is the Cilium CNI manager diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index 3f672edd447a..47359e578ffb 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -409,7 +409,7 @@ rules: - apiGroups: - "" resources: - # to perform the translation of a CNP that contains 'ToGroup' to its endpoints + # to perform the translation of a CNP that contains `ToGroup` to its endpoints - services - endpoints verbs: