Skip to content

Commit

Permalink
since no longer in backticks, can remove replacing backticks
Browse files Browse the repository at this point in the history
  • Loading branch information
spowelljr committed May 10, 2024
1 parent c213f42 commit acd2085
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 0 additions & 4 deletions hack/update/cilium_version/update_cilium_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}")
Expand Down
3 changes: 2 additions & 1 deletion pkg/minikube/cni/cilium.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/cni/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit acd2085

Please sign in to comment.