Skip to content

Commit

Permalink
CAPZ v25.0.0 (#1296)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: Daniel Simionato <[email protected]>

* drop draft workflow

* update README

* bump cluster-azure

---------

Co-authored-by: Marie Roque <[email protected]>
Co-authored-by: Lukasz Jakimczuk <[email protected]>
Co-authored-by: Nikola Prokopić <[email protected]>
Co-authored-by: yulianedyalkova <[email protected]>
Co-authored-by: Daniel Simionato <[email protected]>
  • Loading branch information
6 people authored Jul 23, 2024
1 parent 5c6e64c commit 6db27dd
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 13 deletions.
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions azure/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions azure/requests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
releases:
1 change: 1 addition & 0 deletions azure/v25.0.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# :zap: Giant Swarm Release v25.0.0 for CAPZ :zap:
2 changes: 2 additions & 0 deletions azure/v25.0.0/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources:
- release.yaml
120 changes: 120 additions & 0 deletions azure/v25.0.0/release.yaml
Original file line number Diff line number Diff line change
@@ -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
Empty file added capa/archived/.gitkeep
Empty file.
1 change: 1 addition & 0 deletions capa/requests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
releases:
4 changes: 4 additions & 0 deletions capa/v26.0.0/announcement.md
Original file line number Diff line number Diff line change
@@ -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))
33 changes: 20 additions & 13 deletions releases_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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",
},
}

Expand Down Expand Up @@ -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)
}
}

Expand Down

0 comments on commit 6db27dd

Please sign in to comment.