chore: update image URLs and helm repository URLs to hub.zentao.net

- Changed the URL for the `qucheng` helm repository to `https://hub.zentao.net/chartrepo/stable` in `cmd/app/market.go` - Updated the `GetChartRepo` function to use the new URL `https://hub.zentao.net/chartrepo/%s` in `common/func.go` - Changed the image URL for `q-local-provisioner` to `hub.zentao.net/rancher/local-path-provisioner:v0.0.26` in `hack/manifests/storage/local-storage.yaml` - Updated the image URL for `helper-pod` to `hub.zentao.net/rancher/mirrored-library-busybox:1.36.1` in `hack/manifests/storage/local-storage.yaml` - Changed the URL for the `install` helm repository to `https://hub.zentao.net/chartrepo/stable` in `hack/manifests/storage/longhorn.sh` - Updated the image URL for `longhorn-environment-check` to `hub.zentao.net/library/alpine:3.12` in `hack/manifests/storage/longhorn_environment_check.sh` - Changed the URL for the `install` helm repository to `https://hub.zentao.net/chartrepo/stable` in `hack/manifests/storage/nfs.sh` - Updated the URL for the `q-stable` helm repository to `https://hub.zentao.net/chartrepo/stable` in `hack/manifests/storage/openebs-jiva.sh` - Changed the image URL for `qcli-cm` to `hub.zentao.net/platform/podinstall:2022102713` in `hack/tools/podinstall/init.sh` - Updated the image URL for `qcli-cm` to `hub.zentao.net/platform/podinstall:2022102713` in `hack/tools/podinstall/podinstall.yaml` - Changed the registry URL to `hub.zentao.net` in `internal/pkg/cli/helm/helm.go` - Updated the registry URL to `hub.zentao.net` in `internal/pkg/cli/k3stpl/k3stpl.go` - Changed the registry URL to `hub.zentao.net` in `pkg/cluster/cluster.go` Signed-off-by: ysicing <[email protected]>
easysoft · May 17, 2024 · 3411344 · 3411344
1 parent 5518538
commit 3411344
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/cmd/app/market.go b/cmd/app/market.go
@@ -41,7 +41,7 @@ func NewCmdAppMarket(f factory.Factory) *cobra.Command {
 				return err
 			}
 			if len(repos) == 0 {
-				return errors.Errorf("not found qucheng market, you should: %s exp helm repo-add --name qucheng --url https://hub.qucheng.com/chartrepo/stable", os.Args[0])
+				return errors.Errorf("not found qucheng market, you should: %s exp helm repo-add --name qucheng --url https://hub.zentao.net/chartrepo/stable", os.Args[0])
 			}
 			quchengRepoName := ""
 			for _, repo := range repos {
@@ -51,7 +51,7 @@ func NewCmdAppMarket(f factory.Factory) *cobra.Command {
 				}
 			}
 			if len(quchengRepoName) == 0 {
-				return errors.Errorf("not found qucheng market, you should: %s exp helm repo-add --name qucheng --url https://hub.qucheng.com/chartrepo/stable", os.Args[0])
+				return errors.Errorf("not found qucheng market, you should: %s exp helm repo-add --name qucheng --url https://hub.zentao.net/chartrepo/stable", os.Args[0])
 			}
 			charts, err := hc.ListCharts(quchengRepoName, "", false)
 			if err != nil {

diff --git a/common/func.go b/common/func.go
@@ -68,7 +68,7 @@ func GetChartRepo(p string) string {
 	} else {
 		p = "stable"
 	}
-	return fmt.Sprintf("https://hub.qucheng.com/chartrepo/%s", p)
+	return fmt.Sprintf("https://hub.zentao.net/chartrepo/%s", p)
 }
 
 // GetChannel 获取chartrepo channel地址

diff --git a/hack/manifests/storage/local-storage.yaml b/hack/manifests/storage/local-storage.yaml
@@ -67,7 +67,7 @@ spec:
             effect: "NoSchedule"
       containers:
       - name: q-local-provisioner
-        image: "hub.qucheng.com/rancher/local-path-provisioner:v0.0.26"
+        image: "hub.zentao.net/rancher/local-path-provisioner:v0.0.26"
         imagePullPolicy: IfNotPresent
         command:
         - local-path-provisioner
@@ -160,5 +160,5 @@ data:
     spec:
       containers:
       - name: helper-pod
-        image: "hub.qucheng.com/rancher/mirrored-library-busybox:1.36.1"
+        image: "hub.zentao.net/rancher/mirrored-library-busybox:1.36.1"
         imagePullPolicy: IfNotPresent
diff --git a/hack/manifests/storage/longhorn.sh b/hack/manifests/storage/longhorn.sh
@@ -6,7 +6,7 @@
 # license that can be found in the LICENSE file.
 
 qcadmin exp helm repo-list | grep install || (
-  qcadmin exp helm repo-add --name install --url https://hub.qucheng.com/chartrepo/stable
+  qcadmin exp helm repo-add --name install --url https://hub.zentao.net/chartrepo/stable
 )
 qcadmin exp helm repo-update
 

diff --git a/hack/manifests/storage/longhorn_environment_check.sh b/hack/manifests/storage/longhorn_environment_check.sh
@@ -165,7 +165,7 @@ spec:
       hostPID: true
       containers:
       - name: longhorn-environment-check
-        image: hub.qucheng.com/library/alpine:3.12
+        image: hub.zentao.net/library/alpine:3.12
         args: ["/bin/sh", "-c", "sleep 1000000000"]
         volumeMounts:
         - name: mountpoint

diff --git a/hack/manifests/storage/nfs.sh b/hack/manifests/storage/nfs.sh
@@ -4,7 +4,7 @@ ip=${1:-127.0.0.1}
 
 kubectl get sc | grep q-nfs >/dev/null 2>&1 && exit 0
 
-helm repo add install https://hub.qucheng.com/chartrepo/stable
+helm repo add install https://hub.zentao.net/chartrepo/stable
 
 helm repo update
 

diff --git a/hack/manifests/storage/openebs-jiva.sh b/hack/manifests/storage/openebs-jiva.sh
@@ -6,6 +6,6 @@
 # license that can be found in the LICENSE file.
 
 
-helm repo add q-stable https://hub.qucheng.com/chartrepo/stable
+helm repo add q-stable https://hub.zentao.net/chartrepo/stable
 helm repo update
 helm upgrade -i openebs q-stable/openebs -n quickon-storage --create-namespace
diff --git a/hack/scripts/cloud-init.sh b/hack/scripts/cloud-init.sh
@@ -39,7 +39,7 @@ StartLimitBurst=10
 ExecStartPre=-/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s "server" "--docker" "--kubelet-arg=max-pods=220" "--kube-proxy-arg=proxy-mode=ipvs" "--kube-proxy-arg=masquerade-all=true" "--kube-proxy-arg=metrics-bind-address=0.0.0.0" "--data-dir=/opt/quickon/platform" "--pause-image=hub.qucheng.com/library/k3s-pause:3.6" "--disable-network-policy" "--disable-helm-controller" "--disable=servicelb,traefik" " --tls-san=kapi.qucheng.local" "--service-node-port-range=22767-32767" "--system-default-registry=hub.qucheng.com/library" "--cluster-cidr=10.42.0.0/16" "--service-cidr=10.43.0.0/16"
+ExecStart=/usr/local/bin/k3s "server" "--docker" "--kubelet-arg=max-pods=220" "--kube-proxy-arg=proxy-mode=ipvs" "--kube-proxy-arg=masquerade-all=true" "--kube-proxy-arg=metrics-bind-address=0.0.0.0" "--data-dir=/opt/quickon/platform" "--pause-image=hub.zentao.net/library/k3s-pause:3.6" "--disable-network-policy" "--disable-helm-controller" "--disable=servicelb,traefik" " --tls-san=kapi.qucheng.local" "--service-node-port-range=22767-32767" "--system-default-registry=hub.zentao.net/library" "--cluster-cidr=10.42.0.0/16" "--service-cidr=10.43.0.0/16"
 LimitNOFILE=1048576
 LimitNPROC=infinity
 LimitCORE=infinity
@@ -102,7 +102,7 @@ spec:
       serviceAccountName: qcli-cm
       containers:
       - name: qcli-cm
-        image: hub.qucheng.com/platform/podinstall:2022102713
+        image: hub.zentao.net/platform/podinstall:2022102713
         imagePullPolicy: Always
         env:
         - name: APP_NODE_IP

diff --git a/hack/tools/httptls/job.yaml b/hack/tools/httptls/job.yaml
@@ -24,7 +24,7 @@ spec:
       - env:
         - name: DOMAIN
           value: zcz13.haogs.cn
-        image: hub.qucheng.com/platform/tlsrenew:2022
+        image: hub.zentao.net/platform/tlsrenew:2022
         imagePullPolicy: Always
         name: renewtls
       restartPolicy: OnFailure

diff --git a/hack/tools/podinstall/entrypoint.sh b/hack/tools/podinstall/entrypoint.sh
@@ -8,7 +8,7 @@
 
 [ -n "${DEBUG:+1}" ] && set -x
 
-helm repo add install https://hub.qucheng.com/chartrepo/stable
+helm repo add install https://hub.zentao.net/chartrepo/stable
 
 helm repo update
 
@@ -68,7 +68,7 @@ cluster:
   - host: ${APP_NODE_IP}
     init: true
   pod-cidr: 10.42.0.0/16
-  registry: hub.qucheng.com
+  registry: hub.zentao.net
   svc-cidr: 10.43.0.0/16
   token: YywCEEPKVhaDEgF4
   worker: null

diff --git a/hack/tools/podinstall/init.sh b/hack/tools/podinstall/init.sh
@@ -90,7 +90,7 @@ spec:
       serviceAccountName: qcli-cm
       containers:
       - name: qcli-cm
-        image: hub.qucheng.com/platform/podinstall:2022102713
+        image: hub.zentao.net/platform/podinstall:2022102713
         imagePullPolicy: Always
         env:
         - name: APP_NODE_IP

diff --git a/hack/tools/podinstall/podinstall.yaml b/hack/tools/podinstall/podinstall.yaml
@@ -42,7 +42,7 @@ spec:
       serviceAccountName: qcli-cm
       containers:
       - name: qcli-cm
-        image: hub.qucheng.com/platform/podinstall:2022102713
+        image: hub.zentao.net/platform/podinstall:2022102713
         imagePullPolicy: Always
         env:
         - name: APP_NODE_IP

diff --git a/internal/pkg/cli/helm/helm.go b/internal/pkg/cli/helm/helm.go
@@ -75,7 +75,7 @@ func repoInit(f factory.Factory) *cobra.Command {
 		},
 	}
 	helm.Flags().StringVarP(&name, "name", "n", "install", "repo name")
-	helm.Flags().StringVarP(&url, "url", "u", "https://hub.qucheng.com/chartrepo/stable", "repo url")
+	helm.Flags().StringVarP(&url, "url", "u", "https://hub.zentao.net/chartrepo/stable", "repo url")
 	return helm
 }
 

diff --git a/internal/pkg/cli/k3stpl/k3stpl.go b/internal/pkg/cli/k3stpl/k3stpl.go
@@ -63,7 +63,7 @@ func (k3s K3sArgs) Manifests(template string) string {
 		k3s.Master0IP = exnet.LocalIPs()[0]
 	}
 	if k3s.Registry == "" {
-		k3s.Registry = "hub.qucheng.com"
+		k3s.Registry = "hub.zentao.net"
 	}
 	return render(k3s, template)
 }
@@ -93,6 +93,6 @@ func EmbedCommand(f factory.Factory) *cobra.Command {
 	rootCmd.Flags().BoolVar(&k3sargs.OffLine, "offline", false, "offline")
 	rootCmd.Flags().BoolVar(&k3sargs.LocalStorage, "local-storage", true, "local-storage")
 	rootCmd.Flags().StringVar(&k3sargs.Master0IP, "master0ip", "", "master0ip, only work offline mode")
-	rootCmd.Flags().StringVar(&k3sargs.Registry, "registry", "hub.qucheng.com", "registry")
+	rootCmd.Flags().StringVar(&k3sargs.Registry, "registry", "hub.zentao.net", "registry")
 	return rootCmd
 }
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -69,7 +69,7 @@ func NewCluster(f factory.Factory) *Cluster {
 		},
 		DataStore:             "",
 		Storage:               "nfs",
-		Registry:              "hub.qucheng.com",
+		Registry:              "hub.zentao.net",
 		OffLine:               false,
 		IgnorePreflightErrors: false,
 	}
@@ -87,8 +87,8 @@ func (c *Cluster) getInitFlags() []types.Flag {
 			Name:   "hub",
 			P:      &c.Registry,
 			V:      c.Registry,
-			EnvVar: "hub.qucheng.com",
-			Usage:  `custom image hub, e.g: hub.qucheng.com`,
+			EnvVar: "hub.zentao.net",
+			Usage:  `custom image hub, e.g: hub.zentao.net`,
 		},
 		{
 			Name:   "storage",