From 416f7221a6e55b226f544e95b0f0a69f572d249a Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Mon, 4 Mar 2024 13:07:26 +0100 Subject: [PATCH 1/8] Use an alternative repo for k8s deb packages --- .../tasks/install-packages.yml | 2 +- .../repositories/aarch64/redhat/redhat.yml | 22 +++---- .../repositories/x86_64/debian/debian.yml | 6 +- .../x86_64/debian/ubuntu-20.04/packages.yml | 63 +++++++++++-------- 4 files changed, 52 insertions(+), 41 deletions(-) diff --git a/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml b/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml index 25164509bd..967849a5e4 100644 --- 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/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml index fe3bdf84fc..1c584a07c2 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml +++ b/ansible/playbooks/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/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml index 447d31536d..8475575a98 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml +++ b/ansible/playbooks/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/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index 59bebef500..969cbf8e07 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/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 From 2aafc6ff476199a70e91128deaf41bb2b39ba09d Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:02:05 +0100 Subject: [PATCH 2/8] Add conntrack package --- .../repositories/aarch64/redhat/redhat.yml | 22 +++++++++---------- .../x86_64/debian/ubuntu-20.04/packages.yml | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml index 1c584a07c2..fe3bdf84fc 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml +++ b/ansible/playbooks/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/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index 969cbf8e07..cd3047cd8a 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml @@ -7,6 +7,7 @@ packages: - 'bash-completion' - 'ca-certificates' - 'cifs-utils' + - 'conntrack' # for kubelet - 'containerd.io=1.5.11*' # - 'cri-tools=1.25.0*' - 'curl' From 43fe551d802e013abca6eeb9002f0bcd4664f279 Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:55:14 +0100 Subject: [PATCH 3/8] Add conntrack package --- .../kubernetes_common/tasks/install-packages.yml | 2 +- .../x86_64/debian/ubuntu-20.04/packages.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml b/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml index 967849a5e4..25164509bd 100644 --- 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 }}-* + - cri-tools={{ specification.cri_tools_version }}-00 RedHat: - kubelet-{{ specification.version }}-0 - kubectl-{{ specification.version }}-0 diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index cd3047cd8a..83b7487ecb 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml @@ -179,13 +179,13 @@ packages: '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': + 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/cri-tools_1.25.0-00_amd64.deb': + sha256: 189468b949c777e07ca098365cbde0bcbe0c1fdbf8c406501f64bdbb447ae6f8 + 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/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': + 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/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': + 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/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': + 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb': sha256: ca2303ea0eecadf379c65bad855f9ad7c95c16502c0e7b3d50edcb53403c500f From 0aa3c135ec36b908a7f2768692d8c03eb77a48bb Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:37:14 +0100 Subject: [PATCH 4/8] Use an alternative repo for k8s rpm packages --- .../repositories/x86_64/debian/debian.yml | 4 -- .../repositories/x86_64/redhat/redhat.yml | 12 ----- .../x86_64/debian/ubuntu-20.04/packages.yml | 44 +++---------------- .../requirements/x86_64/redhat/packages.yml | 44 ++++++------------- .../src/mode/red_hat_family_mode.py | 5 ++- 5 files changed, 23 insertions(+), 86 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml index 8475575a98..e4ac813c7c 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/debian/debian.yml @@ -4,10 +4,6 @@ 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' - erlang-23.x: content: 'deb https://packages.erlang-solutions.com/ubuntu focal contrib' key: 'https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc' diff --git a/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml index 340c88046e..f70b8e1a7b 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml @@ -34,18 +34,6 @@ 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 - postgresql-13: id: pgdg13 data: | diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index 83b7487ecb..ca333fc453 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml @@ -9,7 +9,6 @@ packages: - 'cifs-utils' - 'conntrack' # for kubelet - 'containerd.io=1.5.11*' - # - 'cri-tools=1.25.0*' - 'curl' - 'docker-ce=5:20.10.8*' - 'docker-ce-cli=5:20.10.8*' @@ -47,6 +46,7 @@ packages: - 'gnupg2' - 'htop' - 'iftop' + - 'iproute2' # for kubelet - 'jq' # for dpkg-scanpackages @@ -139,38 +139,6 @@ 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.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.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*' - - # # 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*' - from_url: # Switched from APT repo because there was only one (the latest) version available (issue #2262) 'https://packages.elastic.co/curator/5/debian9/pool/main/e/elasticsearch-curator/elasticsearch-curator_5.8.3_amd64.deb': @@ -179,13 +147,13 @@ packages: '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/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/cri-tools_1.25.0-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/cri-tools_1.25.0-00_amd64.deb': sha256: 189468b949c777e07ca098365cbde0bcbe0c1fdbf8c406501f64bdbb447ae6f8 - 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/kubeadm_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubeadm_1.22.4-00_amd64.deb': sha256: 27ecaa5eba0ee0f4b9adb9460fdb571b414ad85f0ec1d6060009ea6fdeb3447d - 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/kubectl_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubectl_1.22.4-00_amd64.deb': sha256: 637b120b480b3ede53b93a140bc9d40df648e0ae1415da4a4d2584e1989fee92 - 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/kubelet_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubelet_1.22.4-00_amd64.deb': sha256: 947ff062f2ba903fdd0ef77749219e8b27ca9c56821f503ae58a18a253fef5e1 - 'https://github.com/hitachienergy/alternative-repo/raw/925d75a445b994d73a103dcea5b5ec9d63b4d225/2.0.x/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb': sha256: ca2303ea0eecadf379c65bad855f9ad7c95c16502c0e7b3d50edcb53403c500f diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml index 01fd4f153d..c31279d0d1 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml @@ -29,7 +29,6 @@ packages: - 'containerd.io-1.5.11' - 'container-selinux' - 'copy-jdk-configs' # for java-1.8.0-openjdk-headless - - 'cri-tools-1.25.0' - 'cups-libs' # for java-1.8.0-openjdk-headless - 'curl' - 'dejavu-sans-fonts' # for grafana @@ -51,6 +50,7 @@ packages: - 'gssproxy' # for nfs-utils - 'htop' - 'iftop' + - 'iproute' # for kubelet - 'ipset' # for firewalld - 'iptables' # for iptables-ebtables - 'iptables-ebtables' @@ -107,6 +107,7 @@ packages: - 'samba-client-libs' # for samba-client - 'samba-common' - 'samba-libs' # for cifs-utils + - 'socat' # for kubelet - 'sssd' # needed for samba packages installation - 'sssd-client' # needed for sssd upgrade - 'sssd-common' # needed for sssd upgrade @@ -129,35 +130,7 @@ packages: - 'xorg-x11-font-utils' # for grafana - 'xorg-x11-server-utils' # for grafana - multiple_versioned: - # 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.20.12 - - '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.22.4 - - 'kubeadm-1.22.4' - - 'kubectl-1.22.4' - - 'kubelet-1.22.4' - - # Kubernetes Generic - - 'kubernetes-cni-0.8.6-0' # since K8s v1.18.6 - - 'kubernetes-cni-0.8.7-0' # since K8s v1.19.15 + multiple_versioned: [] from_url: # Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger @@ -166,3 +139,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-1.x86_64.rpm': sha256: 5ad3cc7137bb8599f21eca40d08d671f3c508d856aea01b5a29576fda7f3c827 + # Switched to an alternate repository as K8s legacy repositories have been shut down + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/94772a15db527c2f5541a80690535b0d973d82e3ab34999b57a551d38505d35c-kubelet-1.22.4-0.x86_64.rpm': + sha256: 94772a15db527c2f5541a80690535b0d973d82e3ab34999b57a551d38505d35c + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/a29b8cda9b0efeca5c1aaaaa295938ade6ac6ae4d960d03faf1d6594f5daff18-kubeadm-1.22.4-0.x86_64.rpm': + sha256: a29b8cda9b0efeca5c1aaaaa295938ade6ac6ae4d960d03faf1d6594f5daff18 + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/bc7a9f8e7c6844cfeab2066a84b8fecf8cf608581e56f6f96f80211250f9a5e7-kubectl-1.22.4-0.x86_64.rpm': + sha256: bc7a9f8e7c6844cfeab2066a84b8fecf8cf608581e56f6f96f80211250f9a5e7 + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/db7cb5cb0b3f6875f54d10f02e625573988e3e91fd4fc5eef0b1876bb18604ad-kubernetes-cni-0.8.7-0.x86_64.rpm': + sha256: db7cb5cb0b3f6875f54d10f02e625573988e3e91fd4fc5eef0b1876bb18604ad + 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/e382ead81273ab8ebcddf14cc15bf977e44e1fd541a2cfda6ebe5741c255e59f-cri-tools-1.25.0-0.x86_64.rpm': + sha256: e382ead81273ab8ebcddf14cc15bf977e44e1fd541a2cfda6ebe5741c255e59f diff --git a/ansible/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py b/ansible/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py index c6b9b2a835..239169794c 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py +++ b/ansible/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py @@ -225,8 +225,9 @@ def __download_redhat_packages(self, packages: List[str], only_newest: bool = Tr def _download_packages(self): self.__download_prereq_packages() self.__download_redhat_packages(sorted(set(self._requirements['packages']['from_repo']))) - self.__download_redhat_packages(sorted(set(self._requirements['packages']['multiple_versioned'])), - False) + if self._requirements['packages']['multiple_versioned']: + self.__download_redhat_packages(sorted(set(self._requirements['packages']['multiple_versioned'])), + False) def _download_file(self, url: str, dest: Path): self._tools.wget.download(url, output_document=dest, additional_params=False) From 9526118054dbdeff32bcd5a1827bc34fcf7ab499 Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:25:29 +0100 Subject: [PATCH 5/8] Use an alternative repo for k8s aarch64 packages --- .../repositories/aarch64/redhat/redhat.yml | 12 ---------- .../requirements/aarch64/redhat/packages.yml | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml b/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml index fe3bdf84fc..c576940607 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml @@ -34,18 +34,6 @@ 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 - postgresql-13: id: pgdg13 data: | diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml index 5f370f9ea2..e882b3bb8e 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml @@ -28,7 +28,6 @@ packages: - 'containerd.io-1.5.11' - 'container-selinux' - 'copy-jdk-configs' # for java-1.8.0-openjdk-headless - - 'cri-tools-1.25.0' - 'cups-libs' # for java-1.8.0-openjdk-headless - 'curl' - 'dejavu-sans-fonts' # for grafana @@ -146,6 +145,7 @@ packages: - 'gtk3' - 'harfbuzz' - 'hicolor-icon-theme' + - 'iproute' # for kubelet - 'jasper-libs' - 'jbigkit-libs' - 'lcms2' @@ -187,19 +187,13 @@ packages: - 'pango' - 'pixman' - 'rest' + - 'socat' # for kubelet - 'unixODBC' - 'wxBase3' - 'wxGTK3' - 'wxGTK3-gl' - multiple_versioned: - # K8s v1.22.4 - - 'kubeadm-1.22.4' - - 'kubectl-1.22.4' - - 'kubelet-1.22.4' - - # Kubernetes Generic - - 'kubernetes-cni-0.8.7-0' # since K8s v1.22.4 + multiple_versioned: [] from_url: # Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger @@ -208,3 +202,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-1.aarch64.rpm': sha256: a05354a9363decc3a2b036a58f827e0a4d086791ba73d7cc4b9f05afb592f4d1 + # Switched to an alternate repository as K8s legacy repositories have been shut down + 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/47cf692245b988569f2043a64d388c79c37b17986e803610f1be23855440ac9d-kubeadm-1.22.4-0.aarch64.rpm': + sha256: 47cf692245b988569f2043a64d388c79c37b17986e803610f1be23855440ac9d + 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/6328e0a2e088a63ab105a8db5c44c0bb904448bd07253fe6b0938c6a831c8987-kubectl-1.22.4-0.aarch64.rpm': + sha256: 6328e0a2e088a63ab105a8db5c44c0bb904448bd07253fe6b0938c6a831c8987 + 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/6878752359e91dfe6b46f7c3142f38812829fb10b70628df54ab8a3ec7a0fb2c-kubernetes-cni-0.8.7-0.aarch64.rpm': + sha256: 6878752359e91dfe6b46f7c3142f38812829fb10b70628df54ab8a3ec7a0fb2c + 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/c465474f754abd410046f4dd641aa6550a488af98d95df6009d9d3ef0a8f4575-kubelet-1.22.4-0.aarch64.rpm': + sha256: c465474f754abd410046f4dd641aa6550a488af98d95df6009d9d3ef0a8f4575 + 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/d090f9539485669bc116337e5c666f744b9e862821236fac804285368cab5622-cri-tools-1.25.0-0.aarch64.rpm': + sha256: d090f9539485669bc116337e5c666f744b9e862821236fac804285368cab5622 From 173bda71c58f3d6bcc7017ebb87579e96d9a82b3 Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:27:37 +0100 Subject: [PATCH 6/8] Remove legacy k8s images --- .../requirements/x86_64/images.yml | 106 ------------------ .../defaults/configuration/image-registry.yml | 78 +------------ 2 files changed, 1 insertion(+), 183 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml index 28451f50e1..9dfeb9f07a 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml @@ -39,97 +39,6 @@ images: sha1: d8f4b9b55353f2570188782846b9f16823620a74 # K8s - # v1.18.6 - 'registry.k8s.io/kube-apiserver:v1.18.6': - sha1: 7376c22211a4e854efb9c7d486d125cd6b9ad937 - - 'registry.k8s.io/kube-controller-manager:v1.18.6': - sha1: cd96d2d94dc62a93e8603f362d981dfba8a5917a - - 'registry.k8s.io/kube-scheduler:v1.18.6': - sha1: c40ae182f4af1ddbd7b57fff832979c42847655a - - 'registry.k8s.io/kube-proxy:v1.18.6': - sha1: 75418f30f6e3e6d502ee71d3c7b1253e42cfa6b2 - - 'registry.k8s.io/coredns:1.6.7': - sha1: ff4a87c424b1997544d61542c0f0152625466985 - - 'registry.k8s.io/etcd:3.4.3-0': - sha1: 6afca8c0f0be353a7262c9a4f75cc51e7f77e019 - - 'quay.io/coreos/flannel:v0.12.0-amd64': - sha1: 2eaa0d8d7014c5f5718f26e658f257bf62751ae0 - - 'quay.io/coreos/flannel:v0.12.0': - sha1: 723485a775e6e1abb9ca2da87a48281a248442f3 - - 'calico/cni:v3.15.0': - sha1: c98210c8a91da8717ccce487c0bd88dc01412a14 - - 'calico/kube-controllers:v3.15.0': - sha1: 2057a587ac8992e68eee163e00e50fe55c9b15a8 - - 'calico/node:v3.15.0': - sha1: 3e65c280ba9c0f47c7e1166fb8e154fda22e15d7 - - 'calico/pod2daemon-flexvol:v3.15.0': - sha1: eb2c7d88f22bcb1a26aea227e0bdcc95fca7801e - - # v1.19.15 - 'registry.k8s.io/kube-apiserver:v1.19.15': - sha1: 8ba2f1966563a1cee14c308fb35269a468529fc7 - - 'registry.k8s.io/kube-controller-manager:v1.19.15': - sha1: 36a0dde7704d782291158ed3fc4170f887fa7aca - - 'registry.k8s.io/kube-scheduler:v1.19.15': - sha1: 3ba7a05cc19f1accec94557e81c36d146993f76b - - 'registry.k8s.io/kube-proxy:v1.19.15': - sha1: de785d5892a9394a7cd8c432f40dc1e2874c565f - - # v1.20.12 - 'registry.k8s.io/kube-apiserver:v1.20.12': - sha1: b8c79267b9cbe1310f407f787e7d1643841a4b30 - - 'registry.k8s.io/kube-controller-manager:v1.20.12': - sha1: 88e0b52ce2abe3fbe3bcaf2043fd6a2e8ff4d428 - - 'registry.k8s.io/kube-scheduler:v1.20.12': - sha1: 47934c2c8fbb8e7051ecf3481c466f5021201710 - - 'registry.k8s.io/kube-proxy:v1.20.12': - sha1: 0e562fedb15086e613bf6c6fbc2e4193bc49cc76 - - 'registry.k8s.io/coredns:1.7.0': - sha1: 521d9f2b461ce4b8a1407715596fec93bfb27e64 - - 'registry.k8s.io/pause:3.2': - sha1: a107a151b90d28890f247d4fe951b7b8cf1c7ee7 - - # v1.21.7 - 'registry.k8s.io/kube-apiserver:v1.21.7': - sha1: 8aa1733cdf257a58f02df6ad6e23176d97e81b79 - - 'registry.k8s.io/kube-controller-manager:v1.21.7': - sha1: cf43f4a88e3b6c79014e5b1e31dd2c0de0da3300 - - 'registry.k8s.io/kube-scheduler:v1.21.7': - sha1: f2e62ec380344ea246b40b90cadb3171d211cdab - - 'registry.k8s.io/kube-proxy:v1.21.7': - sha1: a121226c3a55b10fd607d280fc9c471f60b86632 - - 'registry.k8s.io/coredns/coredns:v1.8.0': - sha1: 43da34af984b00bd2fcdf5364ff9526433e499c8 - - 'registry.k8s.io/etcd:3.4.13-0': - sha1: ee125946a39ce208cb7e38d0fc9a985150f1c3fe - - 'registry.k8s.io/pause:3.4.1': - sha1: c4a3022683dee873dc861328dca2d5524910bbc5 - # v1.22.4 'registry.k8s.io/kube-apiserver:v1.22.4': sha1: 753ff29805d9ac873f409f0cd8dec0818dba4b2d @@ -152,24 +61,9 @@ images: 'registry.k8s.io/pause:3.5': sha1: 98f71abc4bdab5a3d5eb779b18483caed2544c5d - 'quay.io/coreos/flannel:v0.14.0-amd64': - sha1: 378e06b6b5ab1c712c961ac73543a59f1ee1c3ac - 'quay.io/coreos/flannel:v0.14.0': sha1: 092a48b4eebb7a2328124a89fb7f2b9b4bcb3991 - 'calico/cni:v3.20.3': - sha1: 9b91b1b9e5c685b90c1c42cc902a2e9a8b1d877a - - 'calico/kube-controllers:v3.20.3': - sha1: 36d0ed61ed2c486904a059e52cea8cfcf0ae8264 - - 'calico/node:v3.20.3': - sha1: 24771a6c1633b4b148f96564aa5b4d7d5e3cd91d - - 'calico/pod2daemon-flexvol:v3.20.3': - sha1: 39eec64bb679b43aec4ee0ce71c7c9544212a8e1 - 'quay.io/coreos/flannel:v0.15.1': sha1: 6ed416d5c4cfb8a13d77368f44fb585d03753888 diff --git a/schema/common/defaults/configuration/image-registry.yml b/schema/common/defaults/configuration/image-registry.yml index ca965e7995..1c481da8f6 100644 --- a/schema/common/defaults/configuration/image-registry.yml +++ b/schema/common/defaults/configuration/image-registry.yml @@ -82,83 +82,7 @@ specification: file_name: kube-controllers-v3.23.3.tar - name: "calico/node:v3.23.3" file_name: node-v3.23.3.tar - legacy: - kubernetes-master: - # CNI plugins - Epiphany 1.3 - 2.0.0 - - name: "quay.io/coreos/flannel:v0.14.0-amd64" - file_name: flannel-v0.14.0-amd64.tar - - name: "calico/cni:v3.20.3" - file_name: cni-v3.20.3.tar - - name: "calico/kube-controllers:v3.20.3" - file_name: kube-controllers-v3.20.3.tar - - name: "calico/node:v3.20.3" - file_name: node-v3.20.3.tar - - name: "calico/pod2daemon-flexvol:v3.20.3" - file_name: pod2daemon-flexvol-v3.20.3.tar - # K8s v1.21.7 - Epiphany 1.3 (transitional version) - - name: "registry.k8s.io/kube-apiserver:v1.21.7" - file_name: kube-apiserver-v1.21.7.tar - - name: "registry.k8s.io/kube-controller-manager:v1.21.7" - file_name: kube-controller-manager-v1.21.7.tar - - name: "registry.k8s.io/kube-proxy:v1.21.7" - file_name: kube-proxy-v1.21.7.tar - - name: "registry.k8s.io/kube-scheduler:v1.21.7" - file_name: kube-scheduler-v1.21.7.tar - - name: "registry.k8s.io/coredns/coredns:v1.8.0" - file_name: coredns-v1.8.0.tar - - name: "registry.k8s.io/etcd:3.4.13-0" - file_name: etcd-3.4.13-0.tar - - name: "registry.k8s.io/pause:3.4.1" - file_name: pause-3.4.1.tar - # K8s v1.20.12 - Epiphany 1.3 (transitional version) - - name: "registry.k8s.io/kube-apiserver:v1.20.12" - file_name: kube-apiserver-v1.20.12.tar - - name: "registry.k8s.io/kube-controller-manager:v1.20.12" - file_name: kube-controller-manager-v1.20.12.tar - - name: "registry.k8s.io/kube-proxy:v1.20.12" - file_name: kube-proxy-v1.20.12.tar - - name: "registry.k8s.io/kube-scheduler:v1.20.12" - file_name: kube-scheduler-v1.20.12.tar - - name: "registry.k8s.io/coredns:1.7.0" - file_name: coredns-1.7.0.tar - - name: "registry.k8s.io/pause:3.2" - file_name: pause-3.2.tar - # K8s v1.19.15 - Epiphany 1.3 (transitional version) - - name: "registry.k8s.io/kube-apiserver:v1.19.15" - file_name: kube-apiserver-v1.19.15.tar - - name: "registry.k8s.io/kube-controller-manager:v1.19.15" - file_name: kube-controller-manager-v1.19.15.tar - - name: "registry.k8s.io/kube-proxy:v1.19.15" - file_name: kube-proxy-v1.19.15.tar - - name: "registry.k8s.io/kube-scheduler:v1.19.15" - file_name: kube-scheduler-v1.19.15.tar - # K8s v1.18.6 - Epiphany 0.7.1 - 1.2 - - name: "registry.k8s.io/kube-apiserver:v1.18.6" - file_name: kube-apiserver-v1.18.6.tar - - name: "registry.k8s.io/kube-controller-manager:v1.18.6" - file_name: kube-controller-manager-v1.18.6.tar - - name: "registry.k8s.io/kube-proxy:v1.18.6" - file_name: kube-proxy-v1.18.6.tar - - name: "registry.k8s.io/kube-scheduler:v1.18.6" - file_name: kube-scheduler-v1.18.6.tar - - name: "registry.k8s.io/coredns:1.6.7" - file_name: coredns-1.6.7.tar - - name: "registry.k8s.io/etcd:3.4.3-0" - file_name: etcd-3.4.3-0.tar - # flannel - - name: "quay.io/coreos/flannel:v0.12.0-amd64" - file_name: flannel-v0.12.0-amd64.tar - - name: "quay.io/coreos/flannel:v0.12.0" - file_name: flannel-v0.12.0.tar - # canal & calico - - name: "calico/cni:v3.15.0" - file_name: cni-v3.15.0.tar - - name: "calico/kube-controllers:v3.15.0" - file_name: kube-controllers-v3.15.0.tar - - name: "calico/node:v3.15.0" - file_name: node-v3.15.0.tar - - name: "calico/pod2daemon-flexvol:v3.15.0" - file_name: pod2daemon-flexvol-v3.15.0.tar + legacy: {} aarch64: generic: applications: From ccb347886b3e6073735ae2a64c7f05d3accd069d Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:13:10 +0100 Subject: [PATCH 7/8] Update packages url after merge --- .../requirements/aarch64/redhat/packages.yml | 10 +++++----- .../x86_64/debian/ubuntu-20.04/packages.yml | 10 +++++----- .../requirements/x86_64/redhat/packages.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml index e882b3bb8e..b05770865c 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml @@ -203,13 +203,13 @@ packages: 'https://dl.grafana.com/oss/release/grafana-8.3.2-1.aarch64.rpm': sha256: a05354a9363decc3a2b036a58f827e0a4d086791ba73d7cc4b9f05afb592f4d1 # Switched to an alternate repository as K8s legacy repositories have been shut down - 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/47cf692245b988569f2043a64d388c79c37b17986e803610f1be23855440ac9d-kubeadm-1.22.4-0.aarch64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/aarch64/redhat/packages/47cf692245b988569f2043a64d388c79c37b17986e803610f1be23855440ac9d-kubeadm-1.22.4-0.aarch64.rpm': sha256: 47cf692245b988569f2043a64d388c79c37b17986e803610f1be23855440ac9d - 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/6328e0a2e088a63ab105a8db5c44c0bb904448bd07253fe6b0938c6a831c8987-kubectl-1.22.4-0.aarch64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/aarch64/redhat/packages/6328e0a2e088a63ab105a8db5c44c0bb904448bd07253fe6b0938c6a831c8987-kubectl-1.22.4-0.aarch64.rpm': sha256: 6328e0a2e088a63ab105a8db5c44c0bb904448bd07253fe6b0938c6a831c8987 - 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/6878752359e91dfe6b46f7c3142f38812829fb10b70628df54ab8a3ec7a0fb2c-kubernetes-cni-0.8.7-0.aarch64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/aarch64/redhat/packages/6878752359e91dfe6b46f7c3142f38812829fb10b70628df54ab8a3ec7a0fb2c-kubernetes-cni-0.8.7-0.aarch64.rpm': sha256: 6878752359e91dfe6b46f7c3142f38812829fb10b70628df54ab8a3ec7a0fb2c - 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/c465474f754abd410046f4dd641aa6550a488af98d95df6009d9d3ef0a8f4575-kubelet-1.22.4-0.aarch64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/aarch64/redhat/packages/c465474f754abd410046f4dd641aa6550a488af98d95df6009d9d3ef0a8f4575-kubelet-1.22.4-0.aarch64.rpm': sha256: c465474f754abd410046f4dd641aa6550a488af98d95df6009d9d3ef0a8f4575 - 'https://github.com/hitachienergy/alternative-repo/raw/d07e4d83f513b9281cf664eaf38c94f69b581d6f/2.0.x/aarch64/redhat/packages/d090f9539485669bc116337e5c666f744b9e862821236fac804285368cab5622-cri-tools-1.25.0-0.aarch64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/aarch64/redhat/packages/d090f9539485669bc116337e5c666f744b9e862821236fac804285368cab5622-cri-tools-1.25.0-0.aarch64.rpm': sha256: d090f9539485669bc116337e5c666f744b9e862821236fac804285368cab5622 diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index ca333fc453..2106e1cb0f 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml @@ -147,13 +147,13 @@ packages: '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/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/cri-tools_1.25.0-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/debian/packages/cri-tools_1.25.0-00_amd64.deb': sha256: 189468b949c777e07ca098365cbde0bcbe0c1fdbf8c406501f64bdbb447ae6f8 - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubeadm_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/debian/packages/kubeadm_1.22.4-00_amd64.deb': sha256: 27ecaa5eba0ee0f4b9adb9460fdb571b414ad85f0ec1d6060009ea6fdeb3447d - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubectl_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/debian/packages/kubectl_1.22.4-00_amd64.deb': sha256: 637b120b480b3ede53b93a140bc9d40df648e0ae1415da4a4d2584e1989fee92 - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubelet_1.22.4-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/debian/packages/kubelet_1.22.4-00_amd64.deb': sha256: 947ff062f2ba903fdd0ef77749219e8b27ca9c56821f503ae58a18a253fef5e1 - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/debian/packages/kubernetes-cni_0.8.7-00_amd64.deb': sha256: ca2303ea0eecadf379c65bad855f9ad7c95c16502c0e7b3d50edcb53403c500f diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml index c31279d0d1..046cd745e7 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml @@ -140,13 +140,13 @@ packages: 'https://dl.grafana.com/oss/release/grafana-8.3.2-1.x86_64.rpm': sha256: 5ad3cc7137bb8599f21eca40d08d671f3c508d856aea01b5a29576fda7f3c827 # Switched to an alternate repository as K8s legacy repositories have been shut down - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/94772a15db527c2f5541a80690535b0d973d82e3ab34999b57a551d38505d35c-kubelet-1.22.4-0.x86_64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/redhat/packages/94772a15db527c2f5541a80690535b0d973d82e3ab34999b57a551d38505d35c-kubelet-1.22.4-0.x86_64.rpm': sha256: 94772a15db527c2f5541a80690535b0d973d82e3ab34999b57a551d38505d35c - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/a29b8cda9b0efeca5c1aaaaa295938ade6ac6ae4d960d03faf1d6594f5daff18-kubeadm-1.22.4-0.x86_64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/redhat/packages/a29b8cda9b0efeca5c1aaaaa295938ade6ac6ae4d960d03faf1d6594f5daff18-kubeadm-1.22.4-0.x86_64.rpm': sha256: a29b8cda9b0efeca5c1aaaaa295938ade6ac6ae4d960d03faf1d6594f5daff18 - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/bc7a9f8e7c6844cfeab2066a84b8fecf8cf608581e56f6f96f80211250f9a5e7-kubectl-1.22.4-0.x86_64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/redhat/packages/bc7a9f8e7c6844cfeab2066a84b8fecf8cf608581e56f6f96f80211250f9a5e7-kubectl-1.22.4-0.x86_64.rpm': sha256: bc7a9f8e7c6844cfeab2066a84b8fecf8cf608581e56f6f96f80211250f9a5e7 - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/db7cb5cb0b3f6875f54d10f02e625573988e3e91fd4fc5eef0b1876bb18604ad-kubernetes-cni-0.8.7-0.x86_64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/redhat/packages/db7cb5cb0b3f6875f54d10f02e625573988e3e91fd4fc5eef0b1876bb18604ad-kubernetes-cni-0.8.7-0.x86_64.rpm': sha256: db7cb5cb0b3f6875f54d10f02e625573988e3e91fd4fc5eef0b1876bb18604ad - 'https://github.com/hitachienergy/alternative-repo/raw/89e5ef7a09f358ad7a027b46a78138b86f88d0cf/2.0.x/x86_64/redhat/packages/e382ead81273ab8ebcddf14cc15bf977e44e1fd541a2cfda6ebe5741c255e59f-cri-tools-1.25.0-0.x86_64.rpm': + 'https://github.com/hitachienergy/alternative-repo/raw/main/2.0.x/x86_64/redhat/packages/e382ead81273ab8ebcddf14cc15bf977e44e1fd541a2cfda6ebe5741c255e59f-cri-tools-1.25.0-0.x86_64.rpm': sha256: e382ead81273ab8ebcddf14cc15bf977e44e1fd541a2cfda6ebe5741c255e59f From e9eff1d2e0c31a9902bfcc16e3dbe1f6dd182490 Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:18:38 +0100 Subject: [PATCH 8/8] Add changelog --- docs/changelogs/CHANGELOG-2.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index 91f1bfd6e6..969ac546a1 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -1,6 +1,12 @@ # Changelog 2.0 +## [2.0.13] 2024-03-DD + +### Fixed + +- [#3443](https://github.com/hitachienergy/epiphany/issues/3443) - K8s legacy repositories shut down + ## [2.0.12] 2024-02-22 ### Added