Skip to content

Commit

Permalink
CNI: enable sidecars in istio-system (#50337)
Browse files Browse the repository at this point in the history
* CNI: enable sidecars in istio-system

This opt out is not required; all Istio components already label
themselves as not injected to avoid circular dependencies. The injector
already injects these.

What ends up happening is CNI skips, then later repairs. This is a bit
silly -- we should just properly let CNI run.

* gen files
  • Loading branch information
howardjohn committed Apr 10, 2024
1 parent c71b83f commit 4c3419c
Show file tree
Hide file tree
Showing 35 changed files with 0 additions and 104 deletions.
4 changes: 0 additions & 4 deletions manifests/charts/base/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions manifests/charts/base/files/profile-openshift-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/base/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/default/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions manifests/charts/default/files/profile-openshift-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/default/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/gateway/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions manifests/charts/gateway/files/profile-openshift-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/gateway/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/istio-cni/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/istio-cni/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion manifests/charts/istio-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ defaults:


excludeNamespaces:
- istio-system
- kube-system

# Allows user to set custom affinity for the DaemonSet
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/istio-operator/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/istio-operator/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/istiod-remote/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/istiod-remote/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/charts/ztunnel/files/profile-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions manifests/charts/ztunnel/files/profile-openshift-ambient.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions manifests/charts/ztunnel/files/profile-openshift.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions manifests/helm-profiles/ambient.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,5 @@ cni:
ambient:
enabled: true

# Default excludes istio-system; its actually fine to redirect there since we opt-out istiod, ztunnel, and istio-cni
excludeNamespaces:
- kube-system

# Ztunnel doesn't use a namespace, so everything here is mostly for ztunnel
variant: distroless
2 changes: 0 additions & 2 deletions manifests/helm-profiles/openshift-ambient.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ cni:
cniConfDir: /etc/cni/multus/net.d
chained: false
cniConfFileName: "istio-cni.conf"
excludeNamespaces:
- kube-system
logLevel: info
privileged: true
provider: "multus"
Expand Down
3 changes: 0 additions & 3 deletions manifests/helm-profiles/openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ cni:
cniConfDir: /etc/cni/multus/net.d
chained: false
cniConfFileName: "istio-cni.conf"
excludeNamespaces:
- istio-system
- kube-system
logLevel: info
provider: "multus"
global:
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/helm/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ cni:
privileged: true
ambient:
enabled: true
# Default excludes istio-system; its actually fine to redirect there since we opt-out istiod, ztunnel, and istio-cni
excludeNamespaces:
- kube-system
`
)

Expand Down

0 comments on commit 4c3419c

Please sign in to comment.