Skip to content
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
8 changes: 4 additions & 4 deletions src/istio/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ components:
charts:
- name: base
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
namespace: istio-system
# Istio's webhooks currently will cause SSA conflicts - https://github.com/istio/istio/issues/59487
# This should be fixed in a future Istio version
serverSideApply: "false"
- name: istiod
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
namespace: istio-system
valuesFiles:
- "../values/base-istiod.yaml"
Expand All @@ -49,13 +49,13 @@ components:
- "chart/values.yaml"
- name: cni
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
namespace: istio-system
valuesFiles:
- "../values/base-cni.yaml"
- name: ztunnel
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
namespace: istio-system
valuesFiles:
- "../values/base-ztunnel.yaml"
Expand Down
2 changes: 1 addition & 1 deletion src/istio/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tasks:
OUT_DIR="src/pepr/operator/crd/generated/istio"

# renovate: datasource=github-tags depName=defenseunicorns/kubernetes-fluent-client versioning=semver
npx kubernetes-fluent-client@3.11.7 crd https://raw.githubusercontent.com/istio/istio/1.29.2/manifests/charts/base/files/crd-all.gen.yaml "$OUT_DIR"
npx kubernetes-fluent-client@3.11.7 crd https://raw.githubusercontent.com/istio/istio/1.29.3/manifests/charts/base/files/crd-all.gen.yaml "$OUT_DIR"

# Istio includes all CRDs in a single YAML file so we need to prune down to just the subset we want to keep
KEEP="authorizationpolicy-v1 gateway-v1 requestauthentication-v1 serviceentry-v1 sidecar-v1 virtualservice-v1"
Expand Down
2 changes: 1 addition & 1 deletion src/istio/values/registry1/cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

cni:
image: registry1.dso.mil/ironbank/tetrate/istio/install-cni:1.29.2-fips
image: registry1.dso.mil/ironbank/tetrate/istio/install-cni:1.29.3-fips
6 changes: 3 additions & 3 deletions src/istio/values/registry1/istiod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

pilot:
image: registry1.dso.mil/ironbank/tetrate/istio/pilot:1.29.2-fips
image: registry1.dso.mil/ironbank/tetrate/istio/pilot:1.29.3-fips
global:
proxy_init:
# renovate: image=registry1.dso.mil/ironbank/tetrate/istio/proxyv2
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.29.2-fips"
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.29.3-fips"
proxy:
# renovate: image=registry1.dso.mil/ironbank/tetrate/istio/proxyv2
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.29.2-fips"
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.29.3-fips"
2 changes: 1 addition & 1 deletion src/istio/values/registry1/ztunnel.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

image: registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.29.2-fips
image: registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.29.3-fips
2 changes: 1 addition & 1 deletion src/istio/values/unicorn/cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

cni:
image: cgr.dev/defenseunicorns.com/istio-install-cni-fips:1.29.2
image: cgr.dev/defenseunicorns.com/istio-install-cni-fips:1.29.3
6 changes: 3 additions & 3 deletions src/istio/values/unicorn/istiod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

pilot:
image: "cgr.dev/defenseunicorns.com/istio-pilot-fips:1.29.2"
image: "cgr.dev/defenseunicorns.com/istio-pilot-fips:1.29.3"
global:
proxy_init:
# renovate: image=cgr.dev/defenseunicorns.com/istio-proxy-fips
image: "###ZARF_REGISTRY###/defenseunicorns.com/istio-proxy-fips:1.29.2"
image: "###ZARF_REGISTRY###/defenseunicorns.com/istio-proxy-fips:1.29.3"
proxy:
# renovate: image=cgr.dev/defenseunicorns.com/istio-proxy-fips
image: "###ZARF_REGISTRY###/defenseunicorns.com/istio-proxy-fips:1.29.2"
image: "###ZARF_REGISTRY###/defenseunicorns.com/istio-proxy-fips:1.29.3"
2 changes: 1 addition & 1 deletion src/istio/values/unicorn/ztunnel.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024-2026 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

image: cgr.dev/defenseunicorns.com/ztunnel-fips:1.29.2
image: cgr.dev/defenseunicorns.com/ztunnel-fips:1.29.3
2 changes: 1 addition & 1 deletion src/istio/values/upstream/cni.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
cni:
image: docker.io/istio/install-cni:1.29.2-distroless
image: docker.io/istio/install-cni:1.29.3-distroless
6 changes: 3 additions & 3 deletions src/istio/values/upstream/istiod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

pilot:
image: "docker.io/istio/pilot:1.29.2-distroless"
image: "docker.io/istio/pilot:1.29.3-distroless"
global:
proxy_init:
# renovate: image=docker.io/istio/proxyv2
image: "###ZARF_REGISTRY###/istio/proxyv2:1.29.2-distroless"
image: "###ZARF_REGISTRY###/istio/proxyv2:1.29.3-distroless"
proxy:
# renovate: image=docker.io/istio/proxyv2
image: "###ZARF_REGISTRY###/istio/proxyv2:1.29.2-distroless"
image: "###ZARF_REGISTRY###/istio/proxyv2:1.29.3-distroless"
2 changes: 1 addition & 1 deletion src/istio/values/upstream/ztunnel.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

image: docker.io/istio/ztunnel:1.29.2-distroless
image: docker.io/istio/ztunnel:1.29.3-distroless
32 changes: 16 additions & 16 deletions src/istio/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ components:
valuesFiles:
- "values/upstream/ztunnel.yaml"
images:
- "docker.io/istio/pilot:1.29.2-distroless"
- "docker.io/istio/proxyv2:1.29.2-distroless"
- "docker.io/istio/install-cni:1.29.2-distroless"
- "docker.io/istio/ztunnel:1.29.2-distroless"
- "docker.io/istio/pilot:1.29.3-distroless"
- "docker.io/istio/proxyv2:1.29.3-distroless"
- "docker.io/istio/install-cni:1.29.3-distroless"
- "docker.io/istio/ztunnel:1.29.3-distroless"
Comment thread
joelmccoy marked this conversation as resolved.

- name: istio-controlplane
required: true
Expand All @@ -58,10 +58,10 @@ components:
- "values/registry1/ztunnel.yaml"
# @lulaStart b4367e52-bef0-4463-a906-e5af6b4aa015
images:
- registry1.dso.mil/ironbank/tetrate/istio/proxyv2:1.29.2-fips
- registry1.dso.mil/ironbank/tetrate/istio/pilot:1.29.2-fips
- registry1.dso.mil/ironbank/tetrate/istio/install-cni:1.29.2-fips
- registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.29.2-fips
- registry1.dso.mil/ironbank/tetrate/istio/proxyv2:1.29.3-fips
- registry1.dso.mil/ironbank/tetrate/istio/pilot:1.29.3-fips
- registry1.dso.mil/ironbank/tetrate/istio/install-cni:1.29.3-fips
- registry1.dso.mil/ironbank/tetrate/istio/ztunnel:1.29.3-fips
# @lulaEnd b4367e52-bef0-4463-a906-e5af6b4aa015

- name: istio-controlplane
Expand All @@ -82,10 +82,10 @@ components:
- "values/unicorn/ztunnel.yaml"
# @lulaStart b4367e52-bef0-4463-a906-e5af6b4aa015
images:
- cgr.dev/defenseunicorns.com/istio-pilot-fips:1.29.2
- cgr.dev/defenseunicorns.com/istio-proxy-fips:1.29.2
- cgr.dev/defenseunicorns.com/istio-install-cni-fips:1.29.2
- cgr.dev/defenseunicorns.com/ztunnel-fips:1.29.2
- cgr.dev/defenseunicorns.com/istio-pilot-fips:1.29.3
- cgr.dev/defenseunicorns.com/istio-proxy-fips:1.29.3
- cgr.dev/defenseunicorns.com/istio-install-cni-fips:1.29.3
- cgr.dev/defenseunicorns.com/ztunnel-fips:1.29.3
# @lulaEnd b4367e52-bef0-4463-a906-e5af6b4aa015

- name: gateway-api-crds
Expand All @@ -98,7 +98,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
releaseName: admin-ingressgateway
namespace: istio-admin-gateway
valuesFiles:
Expand All @@ -115,7 +115,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
releaseName: tenant-ingressgateway
namespace: istio-tenant-gateway
valuesFiles:
Expand All @@ -132,7 +132,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
releaseName: passthrough-ingressgateway
namespace: istio-passthrough-gateway
valuesFiles:
Expand Down Expand Up @@ -161,7 +161,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.29.2
version: 1.29.3
releaseName: egressgateway
namespace: istio-egress-gateway
valuesFiles:
Expand Down
2 changes: 1 addition & 1 deletion src/pepr/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tasks:
- description: "Generate VirtualService advancedHTTP schema from Istio"
cmd: |
# renovate: datasource=github-tags depName=istio/istio versioning=semver
ISTIO_VERSION="1.29.2" npx ts-node src/pepr/scripts/gen-istio-crd-sources.ts
ISTIO_VERSION="1.29.3" npx ts-node src/pepr/scripts/gen-istio-crd-sources.ts
- cmd: |
npx ts-node src/pepr/scripts/gen-crds.ts
description: "Generate CRD YAML files"
Expand Down
Loading