diff --git a/README.md b/README.md index e7a1a6fa0..84cb4d247 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ If your Kubernetes cluster environment meets all requirements mentioned above, t ### Minimal Installation ```bash -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/kubesphere-installer.yaml -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/cluster-configuration.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/cluster-configuration.yaml ``` Then inspect the logs of installation. @@ -113,7 +113,7 @@ Deploy the new version of ks-installer: ```bash # Notice: ks-installer will automatically migrate the configuration. Do not modify the cluster configuration by yourself. -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml ``` > Note: If your KubeSphere version is v3.0.0 or eariler, please upgrade to v3.1.x first. \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index a918dc125..0424d5ec6 100644 --- a/README_zh.md +++ b/README_zh.md @@ -45,8 +45,8 @@ glusterfs kubernetes.io/glusterfs 3d4h ### 最小化快速部署 ```bash -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/kubesphere-installer.yaml -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/cluster-configuration.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/cluster-configuration.yaml # 查看部署进度及日志 $ kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f @@ -113,7 +113,7 @@ kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app= ```bash # 注意: ks-installer会自动迁移cluster-configuration. 请勿自行修改. -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.0/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml ``` diff --git a/controller/installRunner.py b/controller/installRunner.py index 3a1ffd436..5d7642f3a 100755 --- a/controller/installRunner.py +++ b/controller/installRunner.py @@ -46,7 +46,7 @@ "name": "ks-installer", "namespace": "kubesphere-system", "labels": { - "version": "v3.2.1-rc.3" + "version": "v3.2.1" }, }, } diff --git a/deploy/cluster-configuration.yaml b/deploy/cluster-configuration.yaml index 481de7431..5fbd1a5b2 100644 --- a/deploy/cluster-configuration.yaml +++ b/deploy/cluster-configuration.yaml @@ -5,7 +5,7 @@ metadata: name: ks-installer namespace: kubesphere-system labels: - version: v3.2.1-rc.3 + version: v3.2.1 spec: persistence: storageClass: "" # If there is no default StorageClass in your cluster, you need to specify an existing StorageClass here. diff --git a/deploy/kubesphere-installer.yaml b/deploy/kubesphere-installer.yaml index 7a6bf809e..536cc32ef 100644 --- a/deploy/kubesphere-installer.yaml +++ b/deploy/kubesphere-installer.yaml @@ -287,7 +287,7 @@ spec: serviceAccountName: ks-installer containers: - name: installer - image: kubespheredev/ks-installer:v3.2.1-rc.3 + image: kubesphere/ks-installer:v3.2.1 imagePullPolicy: "Always" resources: limits: diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 9071c6cf8..74c19e7b2 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -25,19 +25,19 @@ ks_version: >- {%- if dev_tag is defined and dev_tag != "" -%} {{ dev_tag }} {%- else -%} - v3.2.1-rc.3 + v3.2.1 {%- endif %} #KubeSphere: -ks_apiserver_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-apiserver" +ks_apiserver_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-apiserver" ks_apiserver_tag: "{{ ks_version }}" -ks_controller_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-controller-manager" +ks_controller_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-controller-manager" ks_controller_manager_tag: "{{ ks_version }}" ks_update_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-upgrade" ks_update_tag: v3.0.0 ks_alerting_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-alerting-migration" ks_alerting_migration_tag: "v3.1.0" -ks_console_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-console" +ks_console_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-console" ks_console_tag: "{{ ks_version }}" ks_kubectl_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kubectl" ks_kubectl_tag: v1.22.0 @@ -83,7 +83,7 @@ gatekeeper_release: "v3.5.2" #openpitrix: openpitrix_job_tag: "v3.2.1" -openpitrix_job_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/openpitrix-jobs" +openpitrix_job_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/openpitrix-jobs" minio_repo: "{{ base_repo }}{{ namespace_override | default('minio') }}/minio" minio_tag: RELEASE.2019-08-07T01-59-21Z @@ -94,7 +94,7 @@ snapshot_controller_repo: "{{ base_repo }}{{ namespace_override | default('csipl snapshot_controller_tag: "v4.0.0" # ks-devops -ks_devops_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}" +ks_devops_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}" ks_devops_controller_tag: "{{ ks_version }}" ks_devops_apiserver_tag: "{{ ks_version }}" ks_devops_tools_tag: "{{ ks_version }}" @@ -309,11 +309,11 @@ images: sha256: "{{ tower_checksum|default(None) }}" group: "kubesphere-images" - post_install_job: - repo: "{{ post_install_job_repo }}/{{ post_install_job_image }}" - tag: "{{ post_install_job_tag }}" - sha256: "{{ post_install_job_checksum|default(None) }}" - group: "kubesphere-images" +# post_install_job: +# repo: "{{ post_install_job_repo }}/{{ post_install_job_image }}" +# tag: "{{ post_install_job_tag }}" +# sha256: "{{ post_install_job_checksum|default(None) }}" +# group: "kubesphere-images" cloudcore: repo: "{{ cloudcore_repo }}"