From 1c5dc21e358c073f95ea290dd0078d1c29d0fba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 16 Apr 2024 14:00:25 +0200 Subject: [PATCH] Update fixtures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- .../TestKubeadmAmazonLinux-force.golden | 18 +++++------------- ...ubeadmAmazonLinux-overwrite_registry.golden | 18 +++++------------- .../TestKubeadmAmazonLinux-proxy.golden | 18 +++++------------- .../TestKubeadmAmazonLinux-v1.26.0.golden | 18 +++++------------- .../TestKubeadmAmazonLinux-with_cilium.golden | 18 +++++------------- ...stKubeadmAmazonLinux-with_containerd.golden | 18 +++++------------- ...th_containerd_with_insecure_registry.golden | 18 +++++------------- .../TestKubeadmCentOS-cilium_cluster.golden | 18 +++++------------- .../TestKubeadmCentOS-nutanix_cluster.golden | 18 +++++------------- .../TestKubeadmCentOS-with_containerd.golden | 18 +++++------------- ...th_containerd_with_insecure_registry.golden | 18 +++++------------- .../TestUpgradeKubeadmAndCNIAmazonLinux.golden | 18 +++++------------- .../TestUpgradeKubeadmAndCNICentOS.golden | 18 +++++------------- ...tUpgradeKubeletAndKubectlAmazonLinux.golden | 18 +++++------------- .../TestUpgradeKubeletAndKubectlCentOS.golden | 18 +++++------------- 15 files changed, 75 insertions(+), 195 deletions(-) diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden index 12dd188ca..942c03cca 100644 --- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden +++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden @@ -53,15 +53,6 @@ echo -n "${yum_proxy}" >> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <> /tmp/yum.conf sudo mv /tmp/yum.conf /etc/yum.conf -# Rebuilding the yum cache is required upon migrating from the legacy to the community-owned -# repositories, otherwise, yum will fail to upgrade the packages because it's trying to -# use old revisions (e.g. 1.27.0-0 instead of 1.27.5-150500.1.1). -repo_migration_needed=false - -if sudo grep -q "packages.cloud.google.com" /etc/yum.repos.d/kubernetes.repo; then - repo_migration_needed=true -fi - cat <