From 39ba19b303e5f80ba327d442851b5352f785192a Mon Sep 17 00:00:00 2001
From: pixiake <guofeng@yunify.com>
Date: Tue, 25 Apr 2023 10:46:54 +0800
Subject: [PATCH] fix: local repository is hard-coded as centos7

Signed-off-by: pixiake <guofeng@yunify.com>
---
 .github/workflows/gen-repository-iso.yaml     |  2 -
 .../bootstrap/os/repository/repository_rpm.go |  6 +--
 cmd/kk/pkg/bootstrap/os/tasks.go              |  4 ++
 hack/gen-repository-iso/dockerfile.debian9    | 37 -------------------
 hack/gen-repository-iso/packages.yaml         |  7 +---
 5 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 hack/gen-repository-iso/dockerfile.debian9

diff --git a/.github/workflows/gen-repository-iso.yaml b/.github/workflows/gen-repository-iso.yaml
index f32b4d41..325cc9a1 100644
--- a/.github/workflows/gen-repository-iso.yaml
+++ b/.github/workflows/gen-repository-iso.yaml
@@ -18,8 +18,6 @@ jobs:
             dockerfile: dockerfile.centos7
           - name: almalinux-9.0-rpms
             dockerfile: dockerfile.almalinux90
-          - name: debian9-debs
-            dockerfile: dockerfile.debian9
           - name: debian10-debs
             dockerfile: dockerfile.debian10
           - name: ubuntu-16.04-debs
diff --git a/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go b/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go
index fc9909d9..16606256 100644
--- a/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go
+++ b/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go
@@ -58,14 +58,14 @@ func (r *RedhatPackageManager) Add(runtime connector.Runtime, path string) error
 
 	content := fmt.Sprintf(`cat << EOF > /etc/yum.repos.d/CentOS-local.repo
 [base-local]
-name=CentOS7.6-local
+name=rpms-local
 
 baseurl=file://%s
 
 enabled=1 
 
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+gpgcheck=0
+
 EOF
 `, path)
 	if _, err := runtime.GetRunner().SudoCmd(content, false); err != nil {
diff --git a/cmd/kk/pkg/bootstrap/os/tasks.go b/cmd/kk/pkg/bootstrap/os/tasks.go
index 4fa59cd6..205fd465 100644
--- a/cmd/kk/pkg/bootstrap/os/tasks.go
+++ b/cmd/kk/pkg/bootstrap/os/tasks.go
@@ -422,6 +422,10 @@ func (i *InstallPackage) Execute(runtime connector.Runtime) error {
 		pkg = i.KubeConf.Cluster.System.Rpms
 	}
 
+	if installErr := r.Update(runtime); installErr != nil {
+		return errors.Wrap(errors.WithStack(installErr), "update repository failed")
+	}
+
 	if installErr := r.Install(runtime, pkg...); installErr != nil {
 		return errors.Wrap(errors.WithStack(installErr), "install repository package failed")
 	}
diff --git a/hack/gen-repository-iso/dockerfile.debian9 b/hack/gen-repository-iso/dockerfile.debian9
deleted file mode 100644
index bc1bae57..00000000
--- a/hack/gen-repository-iso/dockerfile.debian9
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM debian:9 as debian9
-ARG TARGETARCH
-ARG OS_RELEASE=stretch
-ARG OS_VERSION=9
-ARG DIR=debian-9-${TARGETARCH}-debs
-ARG PKGS=.common[],.debs[],.debian[],.debian9[]
-ARG BUILD_TOOLS="apt-transport-https software-properties-common ca-certificates curl wget gnupg dpkg-dev genisoimage dirmngr"
-ENV DEBIAN_FRONTEND=noninteractive
-
-# dump system package list
-RUN dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 > packages.list
-RUN apt update -qq \
-    && apt install -y --no-install-recommends $BUILD_TOOLS \
-    && if [ "$TARGETARCH" = "amd64" ]; then \
-        curl -fsSL https://download.gluster.org/pub/gluster/glusterfs/7/rsa.pub | apt-key add - ; \
-        echo deb https://download.gluster.org/pub/gluster/glusterfs/7/LATEST/Debian/${OS_VERSION}/amd64/apt ${OS_RELEASE} main > /etc/apt/sources.list.d/gluster.list ; \
-       fi \
-    && curl -fsSL "https://download.docker.com/linux/debian/gpg" | apt-key add -qq - \
-    && echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/debian ${OS_RELEASE} stable" > /etc/apt/sources.list.d/docker.list \
-    && apt update -qq
-
-WORKDIR /package
-COPY packages.yaml .
-
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
-RUN yq eval "${PKGS}" packages.yaml >> packages.list \
-    && sort -u packages.list | xargs apt-get install --yes --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls
-
-RUN mkdir -p ${DIR} \
-    && wget -q -x -P ${DIR} -i packages.urls \
-    && cd ${DIR} \
-    && dpkg-scanpackages ./ /dev/null | gzip -9c > ./Packages.gz
-
-RUN genisoimage -r -o ${DIR}.iso ${DIR}
-
-FROM scratch
-COPY --from=debian9 /package/*.iso /
diff --git a/hack/gen-repository-iso/packages.yaml b/hack/gen-repository-iso/packages.yaml
index 1faa8a80..4270e215 100644
--- a/hack/gen-repository-iso/packages.yaml
+++ b/hack/gen-repository-iso/packages.yaml
@@ -51,11 +51,6 @@ centos7:
 debian:
   - containerd.io
 
-# The latest version of docker-ce on debian 9 is 19.03.15
-debian9:
-  - docker-ce=5:19.03.15~3-0~debian-stretch
-  - docker-ce-cli=5:19.03.15~3-0~debian-stretch
-
 debian10:
   - docker-ce=5:20.10.8~3-0~debian-buster
   - docker-ce-cli=5:20.10.8~3-0~debian-buster
@@ -86,4 +81,4 @@ almalinux:
 
 almalinux90:
   - docker-ce-20.10.17
-  - docker-ce-cli-20.10.17
\ No newline at end of file
+  - docker-ce-cli-20.10.17