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.

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

chore: switch registry1 ztunnel to proper source #1249

Merged
merged 5 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/reference/UDS Core/prerequisites.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The UDS Operator will dynamically provision network policies to secure traffic b
Istio requires a number of kernel modules to be loaded for full functionality. The below is a script that will ensure these modules are loaded and persisted across reboots (see also Istio's [upstream requirements list](https://istio.io/latest/docs/ops/deployment/platform-requirements/)). Ideally this script is used as part of an image build or cloud-init process on each node.

```console
modules=("br_netfilter" "xt_REDIRECT" "xt_owner" "xt_statistic" "iptable_mangle" "iptable_nat" "xt_conntrack" "xt_tcpudp")
modules=("br_netfilter" "xt_REDIRECT" "xt_owner" "xt_statistic" "iptable_mangle" "iptable_nat" "xt_conntrack" "xt_tcpudp" "xt_connmark" "xt_mark" "ip_set")
for module in "${modules[@]}"; do
modprobe "$module"
echo "$module" >> "/etc/modules-load.d/istio-modules.conf"
Expand Down
19 changes: 6 additions & 13 deletions src/istio/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,17 @@ components:
charts:
- name: cni
valuesFiles:
# Update once Registry1 has working cni image
#- "values/registry1/cni.yaml"
# https://repo1.dso.mil/dsop/tetrate/istio/1.24/install-cni/-/issues/12
# - "values/registry1/cni.yaml"
- "values/upstream/cni.yaml"
- name: ztunnel
valuesFiles:
# Update once Registry1 has working ztunnel image
#- "values/registry1/ztunnel.yaml"
- "values/upstream/ztunnel.yaml"
- "values/registry1/ztunnel.yaml"
images:
# https://github.com/defenseunicorns/uds-core/issues/1225
# Registry1 ztunnel image is not working right now
# https://repo1.dso.mil/dsop/tetrate/istio/1.24/ztunnel/-/issues/9
#- registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.24.2-tetratefips0
- docker.io/istio/ztunnel:1.24.2-distroless
# Registry1s install-cni-fips is not working right now
# https://repo1.dso.mil/dsop/tetrate/istio/1.24/install-cni/-/issues/11
#- registry1.dso.mil/ironbank/opensource/istio/install-cni:1.24.2
- docker.io/istio/install-cni:1.24.2-distroless
# https://repo1.dso.mil/dsop/tetrate/istio/1.24/install-cni/-/issues/12
# - registry1.dso.mil/ironbank/tetrate/istio/install-cni:1.24.2-tetratefips-v0
- registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.24.2-tetratefips0

- name: istio-controlplane
required: true
Expand Down