From 2ecc76bd6a1ab5bfcb0419a4a55fb384841f3684 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Thu, 10 Oct 2024 15:02:44 -0700 Subject: [PATCH] Deprecate packages support for Kubernetes v1.26 (#1168) --- generatebundlefile/data/bundles_dev/1-26.yaml | 101 ----------------- .../data/bundles_prod/1-26.yaml | 103 ------------------ .../data/bundles_staging/1-26.yaml | 102 ----------------- generatebundlefile/hack/generate_bundle.sh | 2 +- generatebundlefile/hack/release_prod.sh | 2 +- generatebundlefile/hack/release_staging.sh | 2 +- 6 files changed, 3 insertions(+), 309 deletions(-) delete mode 100644 generatebundlefile/data/bundles_dev/1-26.yaml delete mode 100644 generatebundlefile/data/bundles_prod/1-26.yaml delete mode 100644 generatebundlefile/data/bundles_staging/1-26.yaml diff --git a/generatebundlefile/data/bundles_dev/1-26.yaml b/generatebundlefile/data/bundles_dev/1-26.yaml deleted file mode 100644 index 48853681..00000000 --- a/generatebundlefile/data/bundles_dev/1-26.yaml +++ /dev/null @@ -1,101 +0,0 @@ -# This info is hardcoded and comes from https://github.com/aws/eks-anywhere-build-tooling -name: "v1-26-1001" -kubernetesVersion: "1.26" -minControllerVersion: "v0.3.2" -packages: - - org: aws - projects: - - name: eks-anywhere-packages - repository: eks-anywhere-packages - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.0.0-latest - - name: eks-anywhere-packages-crds - repository: eks-anywhere-packages-crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.0.0-latest - - name: eks-anywhere-packages-migrations - repository: eks-anywhere-packages-migrations - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.0.0-latest - - name: credential-provider-package - repository: credential-provider-package - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.0.0-latest - - org: aws-containers - projects: - - name: hello-eks-anywhere - repository: hello-eks-anywhere - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: aws-observability - projects: - - name: adot - repository: adot/charts/aws-otel-collector - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: cert-manager - projects: - - name: cert-manager - workloadonly: true - repository: cert-manager/cert-manager - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: harbor - projects: - - name: harbor - repository: harbor/harbor-helm - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: kubernetes - projects: - - name: cluster-autoscaler - repository: cluster-autoscaler/charts/cluster-autoscaler - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 9.37.0-1.26-latest - - org: kubernetes-sigs - projects: - - name: metrics-server - repository: metrics-server/charts/metrics-server - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.7.1-eks-1-26-latest - - org: metallb - projects: - - name: metallb - repository: metallb/metallb - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - name: metallb-crds - repository: metallb/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: emissary - projects: - - name: emissary - repository: emissary-ingress/emissary - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - name: emissary-crds - repository: emissary-ingress/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest - - org: prometheus - projects: - - name: prometheus - repository: prometheus/charts/prometheus - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: latest diff --git a/generatebundlefile/data/bundles_prod/1-26.yaml b/generatebundlefile/data/bundles_prod/1-26.yaml deleted file mode 100644 index e7404921..00000000 --- a/generatebundlefile/data/bundles_prod/1-26.yaml +++ /dev/null @@ -1,103 +0,0 @@ -# This info is hardcoded and comes from https://github.com/aws/eks-anywhere-build-tooling -name: "v1-26-1001" -kubernetesVersion: "1.26" -minControllerVersion: "v0.3.2" -packages: - - org: aws - projects: - - name: eks-anywhere-packages - repository: eks-anywhere-packages - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: eks-anywhere-packages-crds - repository: eks-anywhere-packages-crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: eks-anywhere-packages-migrations - repository: eks-anywhere-packages-migrations - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: credential-provider-package - repository: credential-provider-package - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - org: aws-containers - projects: - - name: hello-eks-anywhere - repository: hello-eks-anywhere - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.1.2-828e7d186ded23e54f6bd95a5ce1319150f7e325 - - org: aws-observability - projects: - - name: adot - repository: adot/charts/aws-otel-collector - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.40.1-79bfaf1a59e931fe45d592d7c1a2d1436a4c8fe9 - - org: cert-manager - projects: - - name: cert-manager - workloadonly: true - repository: cert-manager/cert-manager - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 1.14.7-d63c74411d73bcc4be4a36954aad71f7712bb9a3 - - org: kubernetes - projects: - - name: cluster-autoscaler - repository: cluster-autoscaler/charts/cluster-autoscaler - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 9.37.0-1.26-5bc30af57ef80443d6b4b1a54f3ca5322a41b882 - - org: harbor - projects: - - name: harbor - repository: harbor/harbor-helm - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 2.11.0-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - org: metallb - projects: - - name: metallb - repository: metallb/metallb - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.14.8-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - org: metallb - projects: - - name: metallb-crds - repository: metallb/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.14.8-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - org: kubernetes-sigs - projects: - - name: metrics-server - repository: metrics-server/charts/metrics-server - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.7.1-eks-1-26-39-5bc30af57ef80443d6b4b1a54f3ca5322a41b882 - - org: emissary - projects: - - name: emissary - repository: emissary-ingress/emissary - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 3.9.1-fb83c54b8bc435cc1917ca77be39d82fb45f60c7 - - name: emissary-crds - repository: emissary-ingress/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 3.9.1-fb83c54b8bc435cc1917ca77be39d82fb45f60c7 - - org: prometheus - projects: - - name: prometheus - repository: prometheus/charts/prometheus - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 2.54.0-bc09267cc490825ef74e1191bcb41d0170a9b60c diff --git a/generatebundlefile/data/bundles_staging/1-26.yaml b/generatebundlefile/data/bundles_staging/1-26.yaml deleted file mode 100644 index d8ae4c0e..00000000 --- a/generatebundlefile/data/bundles_staging/1-26.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# This info is hardcoded and comes from https://github.com/aws/eks-anywhere-build-tooling -name: "v1-26-1001" -kubernetesVersion: "1.26" -minControllerVersion: "v0.3.2" -packages: - - org: aws - projects: - - name: eks-anywhere-packages - repository: eks-anywhere-packages - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: eks-anywhere-packages-crds - repository: eks-anywhere-packages-crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: eks-anywhere-packages-migrations - repository: eks-anywhere-packages-migrations - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - name: credential-provider-package - repository: credential-provider-package - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.4.4-e48d47fc6bb79181d452e038901a2d42d651553c - - org: aws-containers - projects: - - name: hello-eks-anywhere - repository: hello-eks-anywhere - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.1.2-828e7d186ded23e54f6bd95a5ce1319150f7e325 - - org: aws-observability - projects: - - name: adot - repository: adot/charts/aws-otel-collector - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.40.1-79bfaf1a59e931fe45d592d7c1a2d1436a4c8fe9 - - org: cert-manager - projects: - - name: cert-manager - workloadonly: true - repository: cert-manager/cert-manager - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 1.14.7-d63c74411d73bcc4be4a36954aad71f7712bb9a3 - - org: emissary - projects: - - name: emissary - repository: emissary-ingress/emissary - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 3.9.1-fb83c54b8bc435cc1917ca77be39d82fb45f60c7 - - name: emissary-crds - repository: emissary-ingress/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 3.9.1-fb83c54b8bc435cc1917ca77be39d82fb45f60c7 - - org: harbor - projects: - - name: harbor - repository: harbor/harbor-helm - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 2.11.0-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - org: kubernetes - projects: - - name: cluster-autoscaler - repository: cluster-autoscaler/charts/cluster-autoscaler - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 9.37.0-1.26-5bc30af57ef80443d6b4b1a54f3ca5322a41b882 - - org: kubernetes-sigs - projects: - - name: metrics-server - repository: metrics-server/charts/metrics-server - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.7.1-eks-1-26-39-5bc30af57ef80443d6b4b1a54f3ca5322a41b882 - - org: metallb - projects: - - name: metallb - repository: metallb/metallb - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.14.8-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - name: metallb-crds - repository: metallb/crds - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 0.14.8-8c79f7c6ffa477da70913e6cf4bf5ca286aad965 - - org: prometheus - projects: - - name: prometheus - repository: prometheus/charts/prometheus - registry: 067575901363.dkr.ecr.us-west-2.amazonaws.com - versions: - - name: 2.54.0-bc09267cc490825ef74e1191bcb41d0170a9b60c - diff --git a/generatebundlefile/hack/generate_bundle.sh b/generatebundlefile/hack/generate_bundle.sh index f13b8ba5..7acac907 100755 --- a/generatebundlefile/hack/generate_bundle.sh +++ b/generatebundlefile/hack/generate_bundle.sh @@ -35,7 +35,7 @@ fi make build chmod +x ${BASE_DIRECTORY}/generatebundlefile/bin -for version in 1-26 1-27 1-28 1-29 1-30 1-31; do +for version in 1-27 1-28 1-29 1-30 1-31; do generate ${version} "dev" push ${version} "dev" done diff --git a/generatebundlefile/hack/release_prod.sh b/generatebundlefile/hack/release_prod.sh index e97802eb..ef2e9980 100755 --- a/generatebundlefile/hack/release_prod.sh +++ b/generatebundlefile/hack/release_prod.sh @@ -40,7 +40,7 @@ fi # Generate bundles from beta account private ECR registry and # push them to prod account private ECR registry (same as beta account in this case) -for version in 1-26 1-27 1-28 1-29 1-30 1-31; do +for version in 1-27 1-28 1-29 1-30 1-31; do generate ${version} "prod" push ${version} "prod" done diff --git a/generatebundlefile/hack/release_staging.sh b/generatebundlefile/hack/release_staging.sh index ed454441..695021aa 100755 --- a/generatebundlefile/hack/release_staging.sh +++ b/generatebundlefile/hack/release_staging.sh @@ -40,7 +40,7 @@ fi # Generate bundles from beta account private ECR registry and # push them to prod account private ECR registry (same as beta account in this case) -for version in 1-26 1-27 1-28 1-29 1-30 1-31; do +for version in 1-27 1-28 1-29 1-30 1-31; do generate ${version} "staging" push ${version} "staging" done