Use an alternative repo for k8s deb packages

hitachienergy · Mar 4, 2024 · 416f722 · 416f722
1 parent 2e5e07e
commit 416f722
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 41 deletions.
diff --git a/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml b/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml
@@ -29,7 +29,7 @@
         - kubectl={{ specification.version }}-00
         - kubeadm={{ specification.version }}-00
         - kubernetes-cni={{ specification.cni_version }}-00
-        - cri-tools={{ specification.cri_tools_version }}-00
+        - cri-tools={{ specification.cri_tools_version }}-*
       RedHat:
         - kubelet-{{ specification.version }}-0
         - kubectl-{{ specification.version }}-0

diff --git a/...books/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml b/...books/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml
@@ -34,17 +34,17 @@ repositories:
     gpg_keys:
       - https://packages.elastic.co/GPG-KEY-elasticsearch
 
-  kubernetes:
-    id: kubernetes
-    data: |
-      name=Kubernetes
-      baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
-      enabled=1
-      gpgcheck=1
-      repo_gpgcheck=1
-    gpg_keys:
-      - https://packages.cloud.google.com/yum/doc/yum-key.gpg
-      - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+  # kubernetes:
+  #   id: kubernetes
+  #   data: |
+  #     name=Kubernetes
+  #     baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
+  #     enabled=1
+  #     gpgcheck=1
+  #     repo_gpgcheck=1
+  #   gpg_keys:
+  #     - https://packages.cloud.google.com/yum/doc/yum-key.gpg
+  #     - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
 
   postgresql-13:
     id: pgdg13

diff --git a/...ybooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml b/...ybooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml
@@ -4,9 +4,9 @@ repositories:
     content: 'deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main'
     key: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
 
-  kubernetes:
-    content: 'deb http://apt.kubernetes.io/ kubernetes-xenial main'
-    key: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
+  # kubernetes:
+  #   content: 'deb http://apt.kubernetes.io/ kubernetes-xenial main'
+  #   key: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
 
   erlang-23.x:
     content: 'deb https://packages.erlang-solutions.com/ubuntu focal contrib'

diff --git a/...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml
@@ -8,7 +8,7 @@ packages:
     - 'ca-certificates'
     - 'cifs-utils'
     - 'containerd.io=1.5.11*'
-    - 'cri-tools=1.25.0*'
+    # - 'cri-tools=1.25.0*'
     - 'curl'
     - 'docker-ce=5:20.10.8*'
     - 'docker-ce-cli=5:20.10.8*'
@@ -138,37 +138,37 @@ packages:
     # for python3-cryptography
     - 'python3-cffi-backend'
 
-    # K8s v1.18.6 (Epiphany >= v0.7.1)
-    - 'kubeadm=1.18.6*'
-    - 'kubectl=1.18.6*'
-    - 'kubelet=1.18.6*'
+    # # K8s v1.18.6 (Epiphany >= v0.7.1)
+    # - 'kubeadm=1.18.6*'
+    # - 'kubectl=1.18.6*'
+    # - 'kubelet=1.18.6*'
 
-    # K8s v1.19.15 (Epiphany >= v1.3, transitional version)
-    - 'kubeadm=1.19.15*'
-    - 'kubectl=1.19.15*'
-    - 'kubelet=1.19.15*'
+    # # K8s v1.19.15 (Epiphany >= v1.3, transitional version)
+    # - 'kubeadm=1.19.15*'
+    # - 'kubectl=1.19.15*'
+    # - 'kubelet=1.19.15*'
 
-    # K8s v1.20.12 (Epiphany >= v1.3, transitional version)
-    - 'kubeadm=1.20.12*'
-    - 'kubectl=1.20.12*'
-    - 'kubelet=1.20.12*'
+    # # K8s v1.20.12 (Epiphany >= v1.3, transitional version)
+    # - 'kubeadm=1.20.12*'
+    # - 'kubectl=1.20.12*'
+    # - 'kubelet=1.20.12*'
 
-    # K8s v1.21.7 (Epiphany >= v1.3, transitional version)
-    - 'kubeadm=1.21.7*'
-    - 'kubectl=1.21.7*'
-    - 'kubelet=1.21.7*'
+    # # K8s v1.21.7 (Epiphany >= v1.3, transitional version)
+    # - 'kubeadm=1.21.7*'
+    # - 'kubectl=1.21.7*'
+    # - 'kubelet=1.21.7*'
 
-    # K8s v1.22.4
-    - 'kubeadm=1.22.4*'
-    - 'kubectl=1.22.4*'
-    - 'kubelet=1.22.4*'
+    # # K8s v1.22.4
+    # - 'kubeadm=1.22.4*'
+    # - 'kubectl=1.22.4*'
+    # - 'kubelet=1.22.4*'
 
-    # Kubernetes Generic
-    # kubernetes-cni-0.8.6 since K8s v1.18.6
-    - 'kubernetes-cni=0.8.6-00*'
+    # # Kubernetes Generic
+    # # kubernetes-cni-0.8.6 since K8s v1.18.6
+    # - 'kubernetes-cni=0.8.6-00*'
 
-    # kubernetes-cni-0.8.7 since K8s v1.19.15
-    - 'kubernetes-cni=0.8.7-00*'
+    # # kubernetes-cni-0.8.7 since K8s v1.19.15
+    # - 'kubernetes-cni=0.8.7-00*'
 
   from_url:
     # Switched from APT repo because there was only one (the latest) version available (issue #2262)
@@ -177,3 +177,14 @@ packages:
     # Grafana package is not downloaded from repository since it was not reliable (issue #2449)
     'https://dl.grafana.com/oss/release/grafana_8.3.2_amd64.deb':
       sha256: 3f5ecf5726223314aa3147a24c732cc9ccede86b7d703d4835a6fc69d0fffff8
+    # Switched to an alternate repository as K8s legacy repositories have been shut down
+    'https://github.com/hitachienergy/alternative-repo/raw/707d0cf83d0e15938a3cee70ff7a96a1970f1191/2.0.x/debian/packages/cri-tools_1.25.0-1.1_amd64.deb':
+      sha256: 7bd71a8a93d38dbcf6901cde1ee9f8415cf3dfddabf793dd37728198e3b26c23
+    'https://github.com/hitachienergy/alternative-repo/raw/707d0cf83d0e15938a3cee70ff7a96a1970f1191/2.0.x/debian/packages/kubeadm_1.22.4-00_amd64.deb':
+      sha256: 27ecaa5eba0ee0f4b9adb9460fdb571b414ad85f0ec1d6060009ea6fdeb3447d
+    'https://github.com/hitachienergy/alternative-repo/raw/707d0cf83d0e15938a3cee70ff7a96a1970f1191/2.0.x/debian/packages/kubectl_1.22.4-00_amd64.deb':
+      sha256: 637b120b480b3ede53b93a140bc9d40df648e0ae1415da4a4d2584e1989fee92
+    'https://github.com/hitachienergy/alternative-repo/raw/707d0cf83d0e15938a3cee70ff7a96a1970f1191/2.0.x/debian/packages/kubelet_1.22.4-00_amd64.deb':
+      sha256: 947ff062f2ba903fdd0ef77749219e8b27ca9c56821f503ae58a18a253fef5e1
+    'https://github.com/hitachienergy/alternative-repo/raw/707d0cf83d0e15938a3cee70ff7a96a1970f1191/2.0.x/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb':
+      sha256: ca2303ea0eecadf379c65bad855f9ad7c95c16502c0e7b3d50edcb53403c500f