Merge pull request #2852 from Nordix/Sunnatillo/update-fix-k8s-repo

metal3-io-bot · web-flow · commit 199d7a2f4d3c · 2025-10-10T15:11:40.000+03:00
🌱 Remove k8s repo from kubeadm config
diff --git a/test/e2e/data/infrastructure-metal3/main/bases/centos-kubeadm-config/centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/main/bases/centos-kubeadm-config/centos-kubeadm-config.yaml
@@ -91,17 +91,6 @@ spec:
       path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       owner: root:root
       permissions: '0600'
-    - content: |
-        [kubernetes]
-        name=Kubernetes
-        baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-        enabled=1
-        gpgcheck=1
-        repo_gpgcheck=0
-        gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-      owner: root:root
-      path: /etc/yum.repos.d/kubernetes.repo
-      permissions: '0644'
     - content: |
         [registries.search]
         registries = ['docker.io']
@@ -217,17 +206,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/main/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/main/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml
@@ -98,17 +98,6 @@ spec:
           path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
           owner: root:root
           permissions: '0600'
-        - content: |
-            [kubernetes]
-            name=Kubernetes
-            baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-            enabled=1
-            gpgcheck=1
-            repo_gpgcheck=0
-            gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-          owner: root:root
-          path: /etc/yum.repos.d/kubernetes.repo
-          permissions: '0644'
         - content: |
             [registries.search]
             registries = ['docker.io']
@@ -224,17 +213,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/main/bases/opensuse-leap-kubeadm-config/opensuse-leap-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/main/bases/opensuse-leap-kubeadm-config/opensuse-leap-kubeadm-config.yaml
@@ -210,16 +210,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/zypp/repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION_MINOR/rpm/
-          enabled=1
-          gpgcheck=1
-          gpgkey=https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION_MINOR/rpm/repodata/repomd.xml.key
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.10/bases/centos-kubeadm-config/centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.10/bases/centos-kubeadm-config/centos-kubeadm-config.yaml
@@ -91,17 +91,6 @@ spec:
       path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       owner: root:root
       permissions: '0600'
-    - content: |
-        [kubernetes]
-        name=Kubernetes
-        baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-        enabled=1
-        gpgcheck=1
-        repo_gpgcheck=0
-        gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-      owner: root:root
-      path: /etc/yum.repos.d/kubernetes.repo
-      permissions: '0644'
     - content: |
         [registries.search]
         registries = ['docker.io']
@@ -205,17 +194,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.10/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.10/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml
@@ -99,17 +99,6 @@ spec:
           path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
           owner: root:root
           permissions: '0600'
-        - content: |
-            [kubernetes]
-            name=Kubernetes
-            baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-            enabled=1
-            gpgcheck=1
-            repo_gpgcheck=0
-            gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-          owner: root:root
-          path: /etc/yum.repos.d/kubernetes.repo
-          permissions: '0644'
         - content: |
             [registries.search]
             registries = ['docker.io']
@@ -213,17 +202,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.11/bases/centos-kubeadm-config/centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.11/bases/centos-kubeadm-config/centos-kubeadm-config.yaml
@@ -91,17 +91,6 @@ spec:
       path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       owner: root:root
       permissions: '0600'
-    - content: |
-        [kubernetes]
-        name=Kubernetes
-        baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-        enabled=1
-        gpgcheck=1
-        repo_gpgcheck=0
-        gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-      owner: root:root
-      path: /etc/yum.repos.d/kubernetes.repo
-      permissions: '0644'
     - content: |
         [registries.search]
         registries = ['docker.io']
@@ -217,17 +206,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.11/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.11/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml
@@ -98,17 +98,6 @@ spec:
           path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
           owner: root:root
           permissions: '0600'
-        - content: |
-            [kubernetes]
-            name=Kubernetes
-            baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-            enabled=1
-            gpgcheck=1
-            repo_gpgcheck=0
-            gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-          owner: root:root
-          path: /etc/yum.repos.d/kubernetes.repo
-          permissions: '0644'
         - content: |
             [registries.search]
             registries = ['docker.io']
@@ -224,17 +213,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.11/bases/opensuse-leap-kubeadm-config/opensuse-leap-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.11/bases/opensuse-leap-kubeadm-config/opensuse-leap-kubeadm-config.yaml
@@ -210,16 +210,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/zypp/repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION_MINOR/rpm/
-          enabled=1
-          gpgcheck=1
-          gpgkey=https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION_MINOR/rpm/repodata/repomd.xml.key
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.9/bases/centos-kubeadm-config/centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.9/bases/centos-kubeadm-config/centos-kubeadm-config.yaml
@@ -91,17 +91,6 @@ spec:
       path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       owner: root:root
       permissions: '0600'
-    - content: |
-        [kubernetes]
-        name=Kubernetes
-        baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-        enabled=1
-        gpgcheck=1
-        repo_gpgcheck=0
-        gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-      owner: root:root
-      path: /etc/yum.repos.d/kubernetes.repo
-      permissions: '0644'
     - content: |
         [registries.search]
         registries = ['docker.io']
@@ -205,17 +194,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
diff --git a/test/e2e/data/infrastructure-metal3/v1.9/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/v1.9/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml
@@ -99,17 +99,6 @@ spec:
           path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
           owner: root:root
           permissions: '0600'
-        - content: |
-            [kubernetes]
-            name=Kubernetes
-            baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-            enabled=1
-            gpgcheck=1
-            repo_gpgcheck=0
-            gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-          owner: root:root
-          path: /etc/yum.repos.d/kubernetes.repo
-          permissions: '0644'
         - content: |
             [registries.search]
             registries = ['docker.io']
@@ -213,17 +202,6 @@ spec:
           [ipv6]
           addr-gen-mode=eui64
           method=ignore
-      - path: /etc/yum.repos.d/kubernetes.repo
-        owner: root:root
-        permissions: '0644'
-        content: |
-          [kubernetes]
-          name=Kubernetes
-          baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-          enabled=1
-          gpgcheck=1
-          repo_gpgcheck=0
-          gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
       - path : /etc/containers/registries.conf
         owner: root:root
         permissions: '0644'
