diff --git a/README.md b/README.md index e1936eabf..b290bc198 100644 --- a/README.md +++ b/README.md @@ -225,14 +225,14 @@ to all Giant Swarm installations. - v20 - v20.0 - - [v20.0.0-beta1](https://github.com/giantswarm/releases/tree/master/azure/v20.0.0-beta1) + - [v20.0.0-beta1](https://github.com/giantswarm/releases/tree/master/azure/archived/v20.0.0-beta1) - v19 - v19.1 - - [v19.1.0](https://github.com/giantswarm/releases/tree/master/azure/v19.1.0) + - [v19.1.0](https://github.com/giantswarm/releases/tree/master/azure/archived/v19.1.0) - v19.0 - - [v19.0.1](https://github.com/giantswarm/releases/tree/master/azure/v19.0.1) + - [v19.0.1](https://github.com/giantswarm/releases/tree/master/azure/archived/v19.0.1) - [v19.0.0](https://github.com/giantswarm/releases/tree/master/azure/archived/v19.0.0) - v18 diff --git a/azure/v19.0.1/README.md b/azure/archived/v19.0.1/README.md similarity index 100% rename from azure/v19.0.1/README.md rename to azure/archived/v19.0.1/README.md diff --git a/azure/v19.0.1/announcement.md b/azure/archived/v19.0.1/announcement.md similarity index 100% rename from azure/v19.0.1/announcement.md rename to azure/archived/v19.0.1/announcement.md diff --git a/azure/v19.0.1/kustomization.yaml b/azure/archived/v19.0.1/kustomization.yaml similarity index 100% rename from azure/v19.0.1/kustomization.yaml rename to azure/archived/v19.0.1/kustomization.yaml diff --git a/azure/v19.0.1/release.diff b/azure/archived/v19.0.1/release.diff similarity index 100% rename from azure/v19.0.1/release.diff rename to azure/archived/v19.0.1/release.diff diff --git a/azure/v19.0.1/release.yaml b/azure/archived/v19.0.1/release.yaml similarity index 99% rename from azure/v19.0.1/release.yaml rename to azure/archived/v19.0.1/release.yaml index b08c6de8b..678ca1812 100644 --- a/azure/v19.0.1/release.yaml +++ b/azure/archived/v19.0.1/release.yaml @@ -135,7 +135,7 @@ spec: - name: etcd version: 3.5.7 date: "2023-02-07T10:48:28Z" - state: active + state: deprecated status: inUse: false ready: false diff --git a/azure/v19.1.0/README.md b/azure/archived/v19.1.0/README.md similarity index 100% rename from azure/v19.1.0/README.md rename to azure/archived/v19.1.0/README.md diff --git a/azure/v19.1.0/announcement.md b/azure/archived/v19.1.0/announcement.md similarity index 100% rename from azure/v19.1.0/announcement.md rename to azure/archived/v19.1.0/announcement.md diff --git a/azure/v19.1.0/kustomization.yaml b/azure/archived/v19.1.0/kustomization.yaml similarity index 100% rename from azure/v19.1.0/kustomization.yaml rename to azure/archived/v19.1.0/kustomization.yaml diff --git a/azure/v19.1.0/release.diff b/azure/archived/v19.1.0/release.diff similarity index 100% rename from azure/v19.1.0/release.diff rename to azure/archived/v19.1.0/release.diff diff --git a/azure/v19.1.0/release.yaml b/azure/archived/v19.1.0/release.yaml similarity index 99% rename from azure/v19.1.0/release.yaml rename to azure/archived/v19.1.0/release.yaml index e1cce808a..0924eb156 100644 --- a/azure/v19.1.0/release.yaml +++ b/azure/archived/v19.1.0/release.yaml @@ -142,7 +142,7 @@ spec: - name: etcd version: 3.5.9 date: "2023-06-26T07:36:21Z" - state: active + state: deprecated status: inUse: false ready: false diff --git a/azure/v20.0.0-beta1/README.md b/azure/archived/v20.0.0-beta1/README.md similarity index 100% rename from azure/v20.0.0-beta1/README.md rename to azure/archived/v20.0.0-beta1/README.md diff --git a/azure/v20.0.0-beta1/kustomization.yaml b/azure/archived/v20.0.0-beta1/kustomization.yaml similarity index 100% rename from azure/v20.0.0-beta1/kustomization.yaml rename to azure/archived/v20.0.0-beta1/kustomization.yaml diff --git a/azure/v20.0.0-beta1/release.diff b/azure/archived/v20.0.0-beta1/release.diff similarity index 100% rename from azure/v20.0.0-beta1/release.diff rename to azure/archived/v20.0.0-beta1/release.diff diff --git a/azure/v20.0.0-beta1/release.yaml b/azure/archived/v20.0.0-beta1/release.yaml similarity index 99% rename from azure/v20.0.0-beta1/release.yaml rename to azure/archived/v20.0.0-beta1/release.yaml index 0061774ee..f8db16bb1 100644 --- a/azure/v20.0.0-beta1/release.yaml +++ b/azure/archived/v20.0.0-beta1/release.yaml @@ -128,7 +128,7 @@ spec: - name: etcd version: 3.5.7 date: "2023-05-16T07:47:34Z" - state: active + state: deprecated status: inUse: false ready: false diff --git a/azure/kustomization.yaml b/azure/kustomization.yaml index 0675fb7c5..07c4dd3d3 100644 --- a/azure/kustomization.yaml +++ b/azure/kustomization.yaml @@ -1,8 +1,4 @@ commonAnnotations: giantswarm.io/docs: https://docs.giantswarm.io/ui-api/management-api/crd/releases.release.giantswarm.io/ -resources: -- v19.0.1 -- v19.1.0 -- v20.0.0-beta1 transformers: - releaseNotesTransformer.yaml diff --git a/azure/requests.yaml b/azure/requests.yaml deleted file mode 100644 index 3e3e0c8e6..000000000 --- a/azure/requests.yaml +++ /dev/null @@ -1,37 +0,0 @@ -releases: -- name: "> 19.1.1 < 19.999.999" - requests: - - name: security-bundle - version: ">= 0.18.0" -- name: "> 19.1.0 < 19.999.999" - requests: - - name: chart-operator - version: ">= 3.0.0" - # chart-operator-extensions depends on the `ServiceMonitor` CRD and thus on `prometheus-operator-crd` - - name: chart-operator-extensions - version: ">= 1.1.1" - - name: k8s-audit-metrics - version: ">= 0.5.3" - - name: vertical-pod-autoscaler - version: ">= 3.5.3" - - name: observability-bundle - version: ">= 0.7.3" - - name: security-bundle - version: ">= 0.16.2" -- name: "> 19.0.2 < 19.999.999" - requests: - - name: coredns - version: ">= 1.14.2" - - name: net-exporter - version: ">= 1.16.2" - - name: node-exporter - version: ">= 1.16.1" - # This also requires the removal of the kube-state-metrics app as it is now included in the bundle. - - name: observability-bundle - version: ">= 0.7.0" - - name: vertical-pod-autoscaler - version: ">= 3.3.0" - - name: vertical-pod-autoscaler-crd - version: ">= 2.0.0" - - name: app-operator - version: ">= 6.6.3" diff --git a/releases_test.go b/releases_test.go index 8768e61fa..804a67ecd 100644 --- a/releases_test.go +++ b/releases_test.go @@ -258,16 +258,18 @@ func Test_Releases(t *testing.T) { providerRequests := []releaseRequest{} { var providerRequestsFile requestsFile - 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) + 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) + } } }