Merge pull request #2 from SquidRo/release-3.3

Update image tag and registry for ecpaas.
ECPaaS · Aug 31, 2023 · bf10e4d · bf10e4d
2 parents 87eb8c3 + 82e54f1
commit bf10e4d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-REPO?=ecpaas/ks-installer
-TAG?=v3.3.2
+REPO?=ecpaas-dockerhub.ddns.net/kubesphere/ks-installer
+TAG?=ecpaas-v332
 
 build:
 	docker build . --file Dockerfile --tag $(REPO):$(TAG)

diff --git a/README.md b/README.md
@@ -47,8 +47,10 @@ If your Kubernetes cluster environment meets all requirements mentioned above, t
 In deploy/cluster-configuration.yaml, fix the version that you want
 ```
   ecpaas_console_ver: "v3.3.2" # image tag for ecpaas ks-console
-  ecpaas_apisvr_ver: ""       # image tag for ecpaas ks-api-server
-  ecpaas_cmgr_ver: ""         # image tag for ecpaas ks-control-manager
+  ecpaas_apisvr_ver: ""        # image tag for ecpaas ks-api-server
+  ecpaas_cmgr_ver: ""          # image tag for ecpaas ks-control-manager
+  ecpaas_kubevirt_ver: ""      # image tag for ecpaas kubevirt
+  ecpaas_cdi_ver: ""           # image tag for ecpaas cdi
 ```
 ### Minimal Installation
 

diff --git a/deploy/cluster-configuration.yaml b/deploy/cluster-configuration.yaml
@@ -12,12 +12,14 @@ spec:
   authentication:
     # adminPassword: ""     # Custom password of the admin user. If the parameter exists but the value is empty, a random password is generated. If the parameter does not exist, P@88w0rd is used.
     jwtSecret: ""           # Keep the jwtSecret consistent with the Host Cluster. Retrieve the jwtSecret by executing "kubectl -n kubesphere-system get cm kubesphere-config -o yaml | grep -v "apiVersion" | grep jwtSecret" on the Host Cluster.
-  local_registry: ""        # Add your private registry address if it is needed.
+  local_registry: "ecpaas-dockerhub.ddns.net"        # Add your private registry address if it is needed.
   # dev_tag: ""               # Add your kubesphere image tag you want to install, by default it's same as ks-installer release version.
 
-  # ecpaas_console_ver: "v3.3.2" # image tag for ecpaas ks-console
-  # ecpaas_apisvr_ver: ""       # image tag for ecpaas ks-api-server
-  # ecpaas_cmgr_ver: ""         # image tag for ecpaas ks-control-manager
+  ecpaas_console_ver: "ecpaas-v332" # image tag for ecpaas ks-console
+  ecpaas_apisvr_ver: "ecpaas-v332"  # image tag for ecpaas ks-api-server
+  ecpaas_cmgr_ver: "ecpaas-v332"    # image tag for ecpaas ks-control-manager
+  # ecpaas_kubevirt_ver: ""         # image tag for ecpaas kubevirt
+  # ecpaas_cdi_ver: ""              # image tag for ecpaas cdi
 
   etcd:
     monitoring: false       # Enable or disable etcd monitoring dashboard installation. You have to create a Secret for etcd before you enable it.

diff --git a/deploy/kubesphere-installer.yaml b/deploy/kubesphere-installer.yaml
@@ -316,8 +316,8 @@ spec:
       serviceAccountName: ks-installer
       containers:
       - name: installer
-        image: ecpaas/ks-installer:v3.3.2
-        imagePullPolicy: "Never"
+        image: ecpaas-dockerhub.ddns.net/kubesphere/ks-installer:ecpaas-v332
+        imagePullPolicy: "IfNotPresent"
         resources:
           limits:
             cpu: "1"

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -84,14 +84,14 @@ ks_image_pull_policy: IfNotPresent
 multus_repo: "{{ base_repo }}{{ namespace_override | default('nfvpe') }}/multus"
 multus_tag: stable
 
-kubevirt_version: "v0.50.0"
+kubevirt_version: "{{ ecpaas_kubevirt_ver | default('v0.50.0') }}"
 virt_operator_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/virt-operator"
 virt_api_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/virt-api"
 virt_controller_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/virt-controller"
 virt_handler_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/virt-handler"
 virt_launcher_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/virt-launcher"
 
-cdi_version: "v1.56.0"
+cdi_version: "{{ ecpaas_cdi_ver | default('v1.57.0-alpha1') }}"
 cdi_operator_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/cdi-operator"
 cdi_controller_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/cdi-controller"
 cdi_importer_repo: "{{ base_repo }}{{ namespace_override | default('quay.io/kubevirt') }}/cdi-importer"