diff --git a/rancher-turtles-airgap-resources-chart/Chart.yaml b/rancher-turtles-airgap-resources-chart/Chart.yaml index 88b3e59..c04266d 100644 --- a/rancher-turtles-airgap-resources-chart/Chart.yaml +++ b/rancher-turtles-airgap-resources-chart/Chart.yaml @@ -1,10 +1,10 @@ -#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.6_up0.24.0 -#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.6_up0.24.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.7_up0.24.3 +#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.7_up0.24.3-%RELEASE% apiVersion: v2 -appVersion: 0.24.0 +appVersion: 0.24.3 description: Rancher Turtles utility chart for airgap scenarios home: https://github.com/rancher/turtles/ icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg name: rancher-turtles-airgap-resources type: application -version: "%%CHART_MAJOR%%.0.6+up0.24.0" +version: "%%CHART_MAJOR%%.0.7+up0.24.3" diff --git a/rancher-turtles-chart/Chart.yaml b/rancher-turtles-chart/Chart.yaml index 8d06aac..449fed9 100644 --- a/rancher-turtles-chart/Chart.yaml +++ b/rancher-turtles-chart/Chart.yaml @@ -1,18 +1,18 @@ -#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.6_up0.24.0 -#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.6_up0.24.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.7_up0.24.3 +#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.7_up0.24.3-%RELEASE% annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension - catalog.cattle.io/kube-version: '>= 1.23.0-0' + catalog.cattle.io/kube-version: '>= 1.31.4-0 < 1.34.0-0' catalog.cattle.io/namespace: rancher-turtles-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux - catalog.cattle.io/rancher-version: '>= 2.12.1-0 < 2.13.0-0' + catalog.cattle.io/rancher-version: '>= 2.12.3-0 < 2.13.0-0' catalog.cattle.io/release-name: rancher-turtles catalog.cattle.io/scope: management catalog.cattle.io/type: cluster-tool apiVersion: v2 -appVersion: 0.24.0 +appVersion: 0.24.3 description: Rancher Turtles is an extension to Rancher that brings full Cluster API integration to Rancher. home: https://github.com/rancher/turtles/ @@ -24,4 +24,4 @@ keywords: - provisioning name: rancher-turtles type: application -version: "%%CHART_MAJOR%%.0.6+up0.24.0" +version: "%%CHART_MAJOR%%.0.7+up0.24.3" diff --git a/rancher-turtles-chart/RELEASE_NOTES.md b/rancher-turtles-chart/RELEASE_NOTES.md index c85d98c..3f6d9ca 100644 --- a/rancher-turtles-chart/RELEASE_NOTES.md +++ b/rancher-turtles-chart/RELEASE_NOTES.md @@ -8,35 +8,113 @@ REPLACE ME: A couple sentences describing the deprecation, including links to do * [GitHub issue #REPLACE ME](REPLACE ME) -## Changes since v0.24.0-rc.0 +## Changes since v0.24.2 ## :chart_with_upwards_trend: Overview -- 10 new commits merged +- 67 new commits merged +- 1 bug fixed 🐛 -:book: Additionally, there has been 1 contribution to our documentation and book. (#1714) +## :bug: Bug Fixes +- Build-and-release: Fix: wrong github token value in core capi workflow (#1829) + +## :seedling: Others +- Build-and-release: Append target branch to backport PR title (#1768) + +:book: Additionally, there have been 2 contributions to our documentation and book. (#1865, #1870) ## :question: Sort these by hand -- Build-and-release: Add automation to release turtles in rancher/charts and rancher/rancher (#1663) -- Build-and-release: Doc: Add ADR for updated release process (#1660) -- Build-and-release: Test prime image build (#1710) -- CI: Display kind and docker version in e2e runs (#1707) -- Dependency: Bump forward CAPA to v2.9.1 patch release (#1713) -- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.25.2 to 2.25.3 in the testing-dependencies group (#1692) -- Dependency: Chore(deps): Bump the other-dependencies group with 2 updates (#1693) -- Testing: Test: cleanup import gitops suite/spec (#1704) -- Testing: Use providers charts in e2e (#1699) +- Build-and-release: [main] fix: org value not set in release workflow (#1758) +- Build-and-release: Add backport automation GitHub workflow (#1754) +- Build-and-release: Chore(deps): Bump actions/upload-artifact from 4 to 5 (#1839) +- Build-and-release: Chore(deps): Bump github/codeql-action from 3 to 4 (#1815) +- Build-and-release: Chore(deps): Bump rancher/aws-janitor from 0.2.0 to 0.3.0 (#1743) +- Build-and-release: Chore(deps): Bump rancherlabs/slsactl from 0.0.15 to 0.0.16 (#1833) +- Build-and-release: Chore(deps): Bump rancherlabs/slsactl from 0.0.16 to 0.0.18 (#1840) +- Build-and-release: Chore(deps): Bump rancherlabs/slsactl from 0.0.18 to 0.1.1 (#1856) +- Build-and-release: Chore(deps): Bump sigstore/cosign-installer from 3.10.0 to 4.0.0 (#1834) +- Build-and-release: Ci: Add attestation (#1730) +- Build-and-release: Ci: Add new release workflow (#1721) +- Build-and-release: CI: Fix release workflow (#1729) +- Build-and-release: Ci: Use digests instead of tags when signing images (#1728) +- Build-and-release: Cleanup release workflow and build action (#1755) +- Build-and-release: Docs: Add document for new release process (#1761) +- Build-and-release: Feat: adapt chart to use system default registry (#1711) +- Build-and-release: Fix secret path for backport automation (#1757) +- Build-and-release: Fix: Bump Go version to 1.24.9 (#1838) +- Build-and-release: Fix: update nested imageVersion in values.yaml (#1747) +- Build-and-release: Use bash in release-against-rancher.sh for pushd/popd support (#1760) +- Build-and-release: Use proper path for backport secrets (#1765) +- Caprke2: Providers: update CAPRKE2 to v0.21.1 (#1869) +- Certificates: [feat] cert-manager to wrangler conversion (#1794) +- Chart: Bump rancher-version in chart.yaml (#1785) +- Chart: Chore: Drop CAPRKE2 and CAAPF templates from rancher-turtles chart (#1789) +- Chart: Correct Providers release-name (#1813) +- Chart: Fix: Change `capi-system` namespace to `cattle-capi-system` (#1837) +- Chart: Fix: Change Turtles namespace to `cattle-turtles-system` (#1818) +- Chart: Fix: Set `securityContext` field to Turtles controller and hooks manifests (#1850) +- Chart: Remove Extension mentions from chart (#1871) +- Chart: Set kube-version to actual version in Chart.yaml (#1722) +- CI: Bump e2e to k8s 1.34 (#1872) +- CI: Feat: Install Turtles as system chart in dev-env (#1836) +- CI: Fix gitea ingress template (#1860) +- CI: Use Rancher v2.13 for e2e (#1843) +- CI: Wait for rancher-webhook before installing providers (#1846) +- CI: Wait for rancher-webhook when testing charts (#1853) +- Dependency: Bump kubernetes version to v1.32.x series (#1787) +- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.25.3 to 2.26.0 in /test in the testing-dependencies group (#1801) +- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.25.3 to 2.26.0 in the testing-dependencies group (#1802) +- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.26.0 to 2.27.1 in /test in the testing-dependencies group (#1842) +- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.26.0 to 2.27.1 in the testing-dependencies group (#1841) +- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.27.1 to 2.27.2 in the testing-dependencies group (#1857) +- Dependency: Chore(deps): Bump golang.org/x/text from 0.29.0 to 0.30.0 in the other-dependencies group (#1814) +- Dependency: Chore(deps): Bump sigs.k8s.io/kind from 0.29.0 to 0.30.0 in /test in the other-dependencies group across 1 directory (#1751) +- Fleet: Chart: enable optional fetchConfig for fleet provider (#1734) +- Installation: Add cluster indexed label to all CRDs (#1749) +- Installation: Add helm policy keep to installed providers (#1725) +- Installation: Chore cleanup turtles chart provider refs (#1821) +- Installation: Feat: add fetch capi manifest workflow for air gapped (#1805) +- Installation: Feat: remove embedded capi (#1793) +- Installation: Revert "Enable no-cert-manager by default" (#1792) +- Installation: Standratize helm chart values with other system charts (#1769) +- MISSING_AREA: Add check for externalFleet annotation (#1868) +- MULTIPLE_AREAS[ClusterClass/Capa]: Add EKS ClusterClass example and e2e test (#1712) +- MULTIPLE_AREAS[Installation/Chart]: Enable no-cert-manager by default (#1784) +- MULTIPLE_AREAS[Testing/Capz]: Ci: bump k8s to 1.34 for Azure tests (#1863) +- Operator: [fix] Remove unnecessary finalizer wrapper from CAPIProvider (#1810) +- Operator: Remove clusterclass-operations from values.yaml (#1800) +- Operator: Remove day2 and clusterclass operations code (#1783) +- Testing: Add gitea helpers back to e2e setup (#1851) +- Testing: Fix: Drop CAPRKE2 from expected set of default deployments (#1798) +- Testing: Print error in artifacts collection instead of failing the suite (#1717) ## Dependencies ### Added -_Nothing has changed._ +- github.com/gkampitakis/ciinfo: [v0.3.2](https://github.com/gkampitakis/ciinfo/tree/v0.3.2) +- github.com/gkampitakis/go-diff: [v1.3.2](https://github.com/gkampitakis/go-diff/tree/v1.3.2) +- github.com/gkampitakis/go-snaps: [v0.5.15](https://github.com/gkampitakis/go-snaps/tree/v0.5.15) +- github.com/goccy/go-yaml: [v1.18.0](https://github.com/goccy/go-yaml/tree/v1.18.0) +- github.com/joshdk/go-junit: [v1.0.0](https://github.com/joshdk/go-junit/tree/v1.0.0) +- github.com/maruel/natural: [v1.1.1](https://github.com/maruel/natural/tree/v1.1.1) +- github.com/mfridman/tparse: [v0.18.0](https://github.com/mfridman/tparse/tree/v0.18.0) +- github.com/tidwall/gjson: [v1.18.0](https://github.com/tidwall/gjson/tree/v1.18.0) +- github.com/tidwall/match: [v1.1.1](https://github.com/tidwall/match/tree/v1.1.1) +- github.com/tidwall/pretty: [v1.2.1](https://github.com/tidwall/pretty/tree/v1.2.1) +- github.com/tidwall/sjson: [v1.2.5](https://github.com/tidwall/sjson/tree/v1.2.5) ### Changed -- github.com/onsi/ginkgo/v2: [v2.25.2 → v2.25.3](https://github.com/onsi/ginkgo/compare/v2.25.2...v2.25.3) -- github.com/spf13/pflag: [v1.0.7 → v1.0.10](https://github.com/spf13/pflag/compare/v1.0.7...v1.0.10) -- golang.org/x/sync: v0.16.0 → v0.17.0 -- golang.org/x/text: v0.28.0 → v0.29.0 +- github.com/onsi/ginkgo/v2: [v2.25.3 → v2.27.2](https://github.com/onsi/ginkgo/compare/v2.25.3...v2.27.2) +- github.com/rogpeppe/go-internal: [v1.12.0 → v1.13.1](https://github.com/rogpeppe/go-internal/compare/v1.12.0...v1.13.1) +- golang.org/x/crypto: v0.41.0 → v0.42.0 +- golang.org/x/mod: v0.27.0 → v0.28.0 +- golang.org/x/net: v0.43.0 → v0.44.0 +- golang.org/x/sys: v0.35.0 → v0.36.0 +- golang.org/x/telemetry: 1a19826 → aef8a43 +- golang.org/x/term: v0.34.0 → v0.35.0 +- golang.org/x/text: v0.29.0 → v0.30.0 +- golang.org/x/tools: v0.36.0 → v0.37.0 +- sigs.k8s.io/cluster-api: v1.10.5 → v1.10.6 ### Removed -_Nothing has changed._ +- github.com/prashantv/gostub: [v1.1.0](https://github.com/prashantv/gostub/tree/v1.1.0) _Thanks to all our contributors!_ 😊 diff --git a/rancher-turtles-chart/templates/addon-provider-fleet.yaml b/rancher-turtles-chart/templates/addon-provider-fleet.yaml index f42c87e..f1d9fa4 100644 --- a/rancher-turtles-chart/templates/addon-provider-fleet.yaml +++ b/rancher-turtles-chart/templates/addon-provider-fleet.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep spec: enableAutomaticUpdate: true type: addon @@ -30,6 +31,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep data: manifests: |- apiVersion: addons.cluster.x-k8s.io/v1alpha1 diff --git a/rancher-turtles-chart/templates/metal3-infrastructure.yaml b/rancher-turtles-chart/templates/metal3-infrastructure.yaml index 491b186..fa701b0 100644 --- a/rancher-turtles-chart/templates/metal3-infrastructure.yaml +++ b/rancher-turtles-chart/templates/metal3-infrastructure.yaml @@ -9,6 +9,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "1" + "helm.sh/resource-policy": keep name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }} {{- end }} {{- if not (lookup "v1" "Namespace" "" $ipamnamespace) }} @@ -19,6 +20,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "1" + "helm.sh/resource-policy": keep name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "namespace" }} {{- end }} --- @@ -47,6 +49,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep spec: name: metal3 type: infrastructure @@ -83,6 +86,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep spec: name: metal3ipam type: ipam diff --git a/rancher-turtles-chart/templates/pre-delete-job.yaml b/rancher-turtles-chart/templates/pre-delete-job.yaml index c099b9f..a4d591c 100644 --- a/rancher-turtles-chart/templates/pre-delete-job.yaml +++ b/rancher-turtles-chart/templates/pre-delete-job.yaml @@ -59,9 +59,11 @@ spec: image: {{ index .Values "rancherTurtles" "kubectlImage" }} args: - delete - - capiproviders - - -A - - --all + - capiprovider + - cluster-api + - -n + - {{ index .Values "cluster-api-operator" "cluster-api" "core" "namespace" }} + - --ignore-not-found=true - --cascade=foreground restartPolicy: Never {{- end }} diff --git a/rancher-turtles-chart/templates/rke2-bootstrap.yaml b/rancher-turtles-chart/templates/rke2-bootstrap.yaml index 18d5a22..a7bc706 100644 --- a/rancher-turtles-chart/templates/rke2-bootstrap.yaml +++ b/rancher-turtles-chart/templates/rke2-bootstrap.yaml @@ -8,6 +8,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "1" + "helm.sh/resource-policy": keep name: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "namespace" }} {{- end }} --- @@ -19,6 +20,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep spec: name: rke2 type: bootstrap diff --git a/rancher-turtles-chart/templates/rke2-controlplane.yaml b/rancher-turtles-chart/templates/rke2-controlplane.yaml index 1720302..3aaff9b 100644 --- a/rancher-turtles-chart/templates/rke2-controlplane.yaml +++ b/rancher-turtles-chart/templates/rke2-controlplane.yaml @@ -8,6 +8,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "1" + "helm.sh/resource-policy": keep name: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "namespace" }} {{- end }} --- @@ -19,6 +20,7 @@ metadata: annotations: "helm.sh/hook": "post-install, post-upgrade" "helm.sh/hook-weight": "2" + "helm.sh/resource-policy": keep spec: name: rke2 type: controlPlane diff --git a/rancher-turtles-chart/values.yaml b/rancher-turtles-chart/values.yaml index 97d7353..4c84556 100644 --- a/rancher-turtles-chart/values.yaml +++ b/rancher-turtles-chart/values.yaml @@ -9,8 +9,8 @@ turtlesUI: rancherTurtles: # image: registry.rancher.com/rancher/rancher/turtles image: registry.rancher.com/rancher/rancher/turtles - # imageVersion: v0.24.0 - imageVersion: v0.24.0 + # imageVersion: v0.24.3 + imageVersion: v0.24.3 # imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent # namespace: Select namespace for Turtles to run. @@ -33,8 +33,8 @@ rancherTurtles: enabled: false # image: registry.rancher.com/rancher/rancher/turtles image: registry.rancher.com/rancher/rancher/turtles - # imageVersion: v0.24.0 - imageVersion: v0.24.0 + # imageVersion: v0.24.3 + imageVersion: v0.24.3 # imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent # etcdBackupRestore: Alpha feature. Manages etcd backup/restore. @@ -55,8 +55,8 @@ rancherTurtles: enabled: false # image: registry.rancher.com/rancher/rancher/turtles image: registry.rancher.com/rancher/rancher/turtles - # imageVersion: v0.24.0 - imageVersion: v0.24.0 + # imageVersion: v0.24.3 + imageVersion: v0.24.3 # imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent # volumes: Volumes for controller pods. diff --git a/release-manifest-image/release_images.yaml b/release-manifest-image/release_images.yaml index fcec57a..61b7259 100644 --- a/release-manifest-image/release_images.yaml +++ b/release-manifest-image/release_images.yaml @@ -40,7 +40,7 @@ images: - name: registry.rancher.com/rancher/neuvector-enforcer:5.4.6 - name: registry.rancher.com/rancher/nginx-ingress-controller:v1.12.6-hardened1 - name: registry.rancher.com/rancher/rancher-webhook:v0.8.2 - - name: registry.rancher.com/rancher/rancher/turtles:v0.24.0 + - name: registry.rancher.com/rancher/rancher/turtles:v0.24.3 - name: registry.rancher.com/rancher/rancher:v2.12.2 - name: registry.rancher.com/rancher/rke2-cloud-provider:v1.33.4-rc1.0.20250814212538-148243c49519-build20250908 - name: registry.rancher.com/rancher/scc-operator:v0.2.1 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 95a0ab4..29e85db 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -175,11 +175,11 @@ spec: - prettyName: RancherTurtles releaseName: rancher-turtles chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles' - version: '%%CHART_MAJOR%%.0.6+up0.24.0' + version: '%%CHART_MAJOR%%.0.7+up0.24.3' - prettyName: RancherTurtlesAirgapResources releaseName: rancher-turtles-airgap-resources chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-airgap-resources' - version: '%%CHART_MAJOR%%.0.6+up0.24.0' + version: '%%CHART_MAJOR%%.0.7+up0.24.3' - prettyName: CertManager releaseName: cert-manager chart: cert-manager