From 6db27dd5a15d0bf1d6d8338bb0f8b48fad5ab9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20J=C3=BCttner?= Date: Tue, 23 Jul 2024 18:52:39 +0200 Subject: [PATCH] CAPZ v25.0.0 (#1296) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CAPZ v25.0.0 * Update release.yaml * Update release.yaml * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * CAPZ v25.0.0 * bump cilium * testing * testing * bump observability-bundle 1.4.0 * revert bump observability-bundle 1.4.0 * Adding small changes (#1305) * Removing the GCS app (#1309) * Add AWS (CAPA) v26.0.0 release (#1280) * Update Kubernetes version from 1.25.16 to 1.26.15 * Update cluster-autoscaler to 1.27.3-gs10 * Update cloud-provider-aws to 1.26.11-gs1 * Remove CI that creates draft releases * Fix CAPA kustomization * Add announcement --------- Co-authored-by: yulianedyalkova Co-authored-by: Daniel Simionato * drop draft workflow * update README * bump cluster-azure --------- Co-authored-by: Marie Roque Co-authored-by: Lukasz Jakimczuk <39192420+ljakimczuk@users.noreply.github.com> Co-authored-by: Nikola Prokopić <5638639+nprokopic@users.noreply.github.com> Co-authored-by: yulianedyalkova Co-authored-by: Daniel Simionato --- README.md | 16 +++++ azure/kustomization.yaml | 2 + azure/requests.yaml | 1 + azure/v25.0.0/README.md | 1 + azure/v25.0.0/kustomization.yaml | 2 + azure/v25.0.0/release.yaml | 120 +++++++++++++++++++++++++++++++ capa/archived/.gitkeep | 0 capa/requests.yaml | 1 + capa/v26.0.0/announcement.md | 4 ++ releases_test.go | 33 +++++---- 10 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 azure/requests.yaml create mode 100644 azure/v25.0.0/README.md create mode 100644 azure/v25.0.0/kustomization.yaml create mode 100644 azure/v25.0.0/release.yaml create mode 100644 capa/archived/.gitkeep create mode 100644 capa/requests.yaml diff --git a/README.md b/README.md index 7f07d54c2..22f757c53 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,18 @@ merged to the `master` branch, workload cluster releases get automatically deplo to all Giant Swarm installations. ## AWS +- v28 + - v28.0 + - [v28.0.0](https://github.com/giantswarm/releases/tree/master/capa/v28.0.0) +- v27 + - v27.0 + - [v27.0.0](https://github.com/giantswarm/releases/tree/master/capa/v27.0.0) +- v26 + - v26.0 + - [v26.0.0](https://github.com/giantswarm/releases/tree/master/capa/v26.0.0) +- v25 + - v25.0 + - [v25.0.0](https://github.com/giantswarm/releases/tree/master/capa/v25.0.0) - v20 - v20.1 - [v20.1.4](https://github.com/giantswarm/releases/tree/master/aws/v20.1.4) @@ -227,6 +239,10 @@ to all Giant Swarm installations. ## Azure +- v25 + - v25.0 + - [v25.0.0](https://github.com/giantswarm/releases/tree/master/azure/v25.0.0) + - v20 - v20.0 - [v20.0.0-beta1](https://github.com/giantswarm/releases/tree/master/azure/archived/v20.0.0-beta1) diff --git a/azure/kustomization.yaml b/azure/kustomization.yaml index 07c4dd3d3..0c9493cc7 100644 --- a/azure/kustomization.yaml +++ b/azure/kustomization.yaml @@ -1,4 +1,6 @@ commonAnnotations: giantswarm.io/docs: https://docs.giantswarm.io/ui-api/management-api/crd/releases.release.giantswarm.io/ +resources: +- v25.0.0 transformers: - releaseNotesTransformer.yaml diff --git a/azure/requests.yaml b/azure/requests.yaml new file mode 100644 index 000000000..3a59fc4e7 --- /dev/null +++ b/azure/requests.yaml @@ -0,0 +1 @@ +releases: diff --git a/azure/v25.0.0/README.md b/azure/v25.0.0/README.md new file mode 100644 index 000000000..de4fe5e91 --- /dev/null +++ b/azure/v25.0.0/README.md @@ -0,0 +1 @@ +# :zap: Giant Swarm Release v25.0.0 for CAPZ :zap: diff --git a/azure/v25.0.0/kustomization.yaml b/azure/v25.0.0/kustomization.yaml new file mode 100644 index 000000000..2c64a5163 --- /dev/null +++ b/azure/v25.0.0/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- release.yaml diff --git a/azure/v25.0.0/release.yaml b/azure/v25.0.0/release.yaml new file mode 100644 index 000000000..7cf670f6a --- /dev/null +++ b/azure/v25.0.0/release.yaml @@ -0,0 +1,120 @@ +apiVersion: release.giantswarm.io/v1alpha1 +kind: Release +metadata: + name: azure-25.0.0 +spec: + apps: + - name: azuredisk-csi-driver + version: 1.26.2-gs6 + dependsOn: + - azure-cloud-controller-manager + - azure-cloud-node-manager + - name: azurefile-csi-driver + version: 1.30.2-gs1 + dependsOn: + - azure-cloud-controller-manager + - azure-cloud-node-manager + - name: azure-cloud-controller-manager + version: 1.24.18-gs6 + dependsOn: + - vertical-pod-autoscaler-crd + - name: azure-cloud-node-manager + version: 1.24.18-gs6 + dependsOn: + - vertical-pod-autoscaler-crd + - name: capi-node-labeler + version: 0.5.0 + - name: cert-exporter + version: 2.9.0 + dependsOn: + - kyverno + - name: cert-manager + version: 3.7.6 + dependsOn: + - prometheus-operator-crd + - name: chart-operator-extensions + version: 1.1.2 + dependsOn: + - prometheus-operator-crd + - name: cilium + version: 0.25.1 + - name: cilium-crossplane-resources + version: 0.1.0 + - name: cilium-servicemonitors + version: 0.1.2 + dependsOn: + - prometheus-operator-crd + - name: coredns + version: 1.21.0 + dependsOn: + - cilium + - name: etcd-k8s-res-count-exporter + version: 1.10.0 + dependsOn: + - kyverno + - name: external-dns + version: 3.1.0 + dependsOn: + - prometheus-operator-crd + - name: irsa-servicemonitors + version: 0.1.0 + dependsOn: + - cert-manager + - name: k8s-audit-metrics + version: 0.9.0 + dependsOn: + - kyverno + - name: k8s-dns-node-cache + version: 2.6.2 + dependsOn: + - kyverno + - name: metrics-server + version: 2.4.2 + dependsOn: + - kyverno + - name: net-exporter + version: 1.19.0 + dependsOn: + - prometheus-operator-crd + - name: network-policies + version: 0.1.1 + catalog: cluster + dependsOn: + - cilium + - name: node-exporter + version: 1.19.0 + dependsOn: + - kyverno + - name: observability-bundle + version: 1.3.4 + dependsOn: + - coredns + - name: prometheus-blackbox-exporter + version: 0.4.2 + dependsOn: + - prometheus-operator-crd + - name: security-bundle + version: 1.7.1 + catalog: giantswarm + dependsOn: + - prometheus-operator-crd + - name: teleport-kube-agent + version: 0.9.0 + - name: vertical-pod-autoscaler + version: 5.2.2 + dependsOn: + - prometheus-operator-crd + - name: vertical-pod-autoscaler-crd + version: 3.1.0 + components: + - name: cluster-azure + catalog: cluster + version: 0.17.0 + - name: flatcar + version: 3815.2.4 + - name: flatcar-variant + version: 1.0.0 + - name: kubernetes + version: 1.25.16 + date: "2024-06-27T18:00:00Z" + state: active diff --git a/capa/archived/.gitkeep b/capa/archived/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/capa/requests.yaml b/capa/requests.yaml new file mode 100644 index 000000000..3a59fc4e7 --- /dev/null +++ b/capa/requests.yaml @@ -0,0 +1 @@ +releases: diff --git a/capa/v26.0.0/announcement.md b/capa/v26.0.0/announcement.md index 18c81b171..b6a9a0c52 100644 --- a/capa/v26.0.0/announcement.md +++ b/capa/v26.0.0/announcement.md @@ -1,4 +1,8 @@ **Workload cluster release v26.0.0 for CAPA is available**. This release upgrades Kubernetes version to v26. +<<<<<<< HEAD Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-capa/releases/aws-26.0.0/). +======= +Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-aws/releases/aws-26.0.0/). +>>>>>>> a43c81d (Add AWS (CAPA) v26.0.0 release (#1280)) diff --git a/releases_test.go b/releases_test.go index 804a67ecd..9e52a7548 100644 --- a/releases_test.go +++ b/releases_test.go @@ -148,6 +148,11 @@ func findReleases(provider string, archived bool) ([]v1alpha1.Release, error) { if err != nil { return nil, microerror.Mask(err) } + if strings.Contains(release.Name, "azure") || strings.Contains(release.Name, "aws") { + parts := strings.Split(release.Name, "-") + release.Name = "v" + parts[len(parts)-1] // + } + if releaseDirectory.Name() != release.Name { return nil, fmt.Errorf("%s release %s is in directory %s which doesn't match its name", provider, release.Name, releaseDirectory) } @@ -221,9 +226,13 @@ func Test_Releases(t *testing.T) { provider: "azure", name: "case 2: azure releases are valid", }, + { + provider: "capa", + name: "case 3: capa releases are valid", + }, { provider: "kvm", - name: "case 3: kvm releases are valid", + name: "case 4: kvm releases are valid", }, } @@ -258,18 +267,16 @@ func Test_Releases(t *testing.T) { providerRequests := []releaseRequest{} { var providerRequestsFile requestsFile - if tc.provider != "azure" { - providerRequestsData, err := ioutil.ReadFile(filepath.Join(tc.provider, requestsFilename)) - if err != nil { - t.Fatal(err) - } - err = yaml.UnmarshalStrict(providerRequestsData, &providerRequestsFile) - if err != nil { - t.Fatal(err) - } - for _, release := range providerRequestsFile.Releases { - providerRequests = append(providerRequests, release) - } + providerRequestsData, err := ioutil.ReadFile(filepath.Join(tc.provider, requestsFilename)) + if err != nil { + t.Fatal(err) + } + err = yaml.UnmarshalStrict(providerRequestsData, &providerRequestsFile) + if err != nil { + t.Fatal(err) + } + for _, release := range providerRequestsFile.Releases { + providerRequests = append(providerRequests, release) } }