add comment to the install.sh,and update the method of 'OK' and 'Status'

.github/workflows/build-images-registry.yml

@@ -10,7 +10,7 @@ on:
     - cron: "0 16 * * *"
 
 env:
-  IMAGE_REPO: "kubespheredev"
+  IMAGE_REPO: "kubesphere"
   IMAGE_NAME: "images-registry"
   IMAGE_TAG: "latest"
   SKOPEO_VERSION: v1.2.0

.github/workflows/deploy-weekly/install.sh

@@ -1,35 +1,44 @@
 function wait_status_ok(){
     for ((n=0;n<30;n++))
-    do  
-        OK=`kubectl get pod -A| grep -E 'Running|Completed' | wc | awk '{print $1}'`
-        Status=`kubectl get pod -A | sed '1d' | wc | awk '{print $1}'`
+    do
+        # Get the number of Running or Completed stats of all pods.
+        OK=$(kubectl get pod -A| grep -cE 'Running|Completed')
+        # Get the number of pod of the whole cluster.
+        Status=$(kubectl get pod -A | sed '1d' | wc -l)
+        # print the success rate.
         echo "Success rate: ${OK}/${Status}"
         if [[ $OK == $Status ]]
         then
             n=$((n+1))
         else
             n=0
         fi
+        # loop for 30 times every 10 seconds.
         sleep 10
         kubectl get all -A
     done
 }
 
+# install the linux packages.
 yum install -y vim openssl socat conntrack ipset wget
+# download the kubeKey
 curl -sfL https://get-kk.kubesphere.io | VERSION=v1.1.0 sh -
 chmod +x kk
 echo "yes" | ./kk create cluster --with-kubernetes v1.20.4
 
+# Use openebs-operator to install the OpenEBS storage.
 kubectl apply -f https://openebs.github.io/charts/openebs-operator.yaml
 wait_status_ok
+# Setup the openebs-hostpath as default storageClass.
 kubectl patch storageclass openebs-hostpath -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
-
+# Online download the kubesphere-installer.yaml file.
 kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/deploy/kubesphere-installer.yaml
+# Online download the cluster-configuration.yaml file.
 kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/deploy/cluster-configuration.yaml
-
+# Edit ks-installer configmap, and replace the false with true.
 kubectl -n kubesphere-system get cc ks-installer -o yaml | sed "s/false/true/g" | kubectl replace -n kubesphere-system cc -f -
-
+# update configmap ks-installer and add new etcd to spec.
 kubectl -n kubesphere-system patch cc ks-installer --type merge --patch '{"spec":{"etcd":{"monitoring":false}}}'
 kubectl -n kubesphere-system patch cc ks-installer --type merge --patch '{"spec":{"etcd":{"tlsEnable":false}}}'
-
+# restart the deployment ks-installer.
 kubectl -n kubesphere-system rollout restart deploy ks-installer

.github/workflows/e2e-TEST.yml

@@ -9,7 +9,7 @@ on:
 env:
   # TODO: Change variable to your image's name.
   IMAGE_NAME: ks-installer
-  IMAGE_REPO: kubespheredev
+  IMAGE_REPO: kubesphere
   IMAGE_VERSION: latest
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_TEST }}
 

.github/workflows/nightly-builds.yml

@@ -10,7 +10,7 @@ on:
 env:
   # TODO: Change variable to your image's name.
   IMAGE_NAME: ks-installer
-  IMAGE_REPO: kubespheredev
+  IMAGE_REPO: kubesphere
   IMAGE_VERSION: latest
 
 jobs:

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Build Release Images List
         run: >
           docker run --rm
-          -v "$PWD":/usr/src/myapp -w /usr/src/myapp kubespheredev/release-tools:v0.0.1
+          -v "$PWD":/usr/src/myapp -w /usr/src/myapp kubesphere/release-tools:v0.0.1
           ansible-playbook release.yml --skip-tags=sync_images
 
       - name: Upload Release Asset (3)

.github/workflows/sync-release-images.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Sync published images to mirror registry
         run: >
           docker run --rm
-          -v "$PWD":/usr/src/myapp -w /usr/src/myapp kubespheredev/release-tools:v0.0.1 sh -c
+          -v "$PWD":/usr/src/myapp -w /usr/src/myapp kubesphere/release-tools:v0.0.1 sh -c
           "skopeo login -u ${{ secrets.DOCKER_USERNAME }} -p \"${{ secrets.DOCKER_PASSWORD }}\" docker.io &&
           skopeo login -u ${{ secrets.REGISTRY_ALIYUN_USERNAME }} -p \"${{ secrets.REGISTRY_ALIYUN_PASSWORD }}\" registry.cn-beijing.aliyuncs.com &&
           ansible-playbook release.yml --skip-tags=images_list"

Dockerfile

@@ -1,4 +1,8 @@
-FROM kubespheredev/shell-operator:v1.0.0-beta.5-alpine3.14
+<<<<<<< HEAD
+FROM kubesphere/shell-operator:v1.0.0-beta.5-alpine3.13
+=======
+FROM kubesphere/shell-operator:v1.0.0-beta.5-alpine3.14
+>>>>>>> upstream/master
 
 ENV  ANSIBLE_ROLES_PATH /kubesphere/installer/roles
 WORKDIR /kubesphere

Makefile

@@ -1,5 +1,10 @@
-REPO?=kubespheredev/ks-installer
+<<<<<<< HEAD
+REPO?=kubesphere/ks-installer
+TAG:=$(shell git rev-parse --abbrev-ref HEAD)-dev
+=======
+REPO?=kubesphere/ks-installer
 TAG:=$(shell git rev-parse --abbrev-ref HEAD | sed -e 's/\//-/g')-dev
+>>>>>>> upstream/master
 
 build:
 	docker build . --file Dockerfile --tag $(REPO):$(TAG)

deploy/kubesphere-installer.yaml

@@ -287,7 +287,11 @@ spec:
       serviceAccountName: ks-installer
       containers:
       - name: installer
-        image: kubespheredev/ks-installer:master
+<<<<<<< HEAD
+        image: kubesphere/ks-installer:latest
+=======
+        image: kubesphere/ks-installer:master
+>>>>>>> upstream/master
         imagePullPolicy: "Always"
         resources:
           limits:

docs/JenkinsUpgradeGuide.md

@@ -61,11 +61,11 @@ from [ks-jenkins](https://github.com/kubesphere/ks-jenkins).
 
 #### Step1:
 
-Update the image from deploy to `kubespheredev/ks-jenkins:2.249.1`
+Update the image from deploy to `kubesphere/ks-jenkins:2.249.1`
 
 ```shell
-kubectl -n kubesphere-devops-system patch deploy ks-jenkins --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value": "kubespheredev/ks-jenkins:2.249.1"}]'
-kubectl -n kubesphere-devops-system patch deploy ks-jenkins --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/initContainers/0/image", "value": "kubespheredev/ks-jenkins:2.249.1"}]'
+kubectl -n kubesphere-devops-system patch deploy ks-jenkins --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value": "kubesphere/ks-jenkins:2.249.1"}]'
+kubectl -n kubesphere-devops-system patch deploy ks-jenkins --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/initContainers/0/image", "value": "kubesphere/ks-jenkins:2.249.1"}]'
 ```
 
 #### Step2:

roles/download/defaults/main.yml

@@ -29,15 +29,21 @@ ks_version: >-
   {%- 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('kubespheredev') }}/ks-alerting-migration"
+<<<<<<< HEAD
+ks_devops_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-devops"
+ks_devops_migration_tag: "flyway-v3.0.0"
+ks_alerting_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-alerting-migration"
+=======
+ks_alerting_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-alerting-migration"
+>>>>>>> upstream/master
 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
@@ -52,7 +58,7 @@ ks_kubectl_versions:
   v1.16.0: v1.16.0
   v1.15.0: v1.0.0
 
-ks_installer_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-installer"
+ks_installer_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-installer"
 ks_installer_tag: "{{ ks_version }}"
 
 ks_image_pull_policy: Always
@@ -71,19 +77,31 @@ post_install_job_image: kubectl
 
 # kubeedge
 cloudcore_repo: "{{ base_repo }}{{ namespace_override | default('kubeedge') }}/cloudcore"
+<<<<<<< HEAD
+cloudcore_tag: "v1.6.2"
+edge_watcher_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher"
+edge_watcher_tag: "v0.1.0"
+edge_watcher_agent_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher-agent"
+=======
 cloudcore_tag: "v1.7.2"
-edge_watcher_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/edge-watcher"
+edge_watcher_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher"
 edge_watcher_tag: "v0.1.1"
-edge_watcher_agent_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/edge-watcher-agent"
+edge_watcher_agent_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher-agent"
+>>>>>>> upstream/master
 edge_watcher_agent_tag: "v0.1.0"
 
 # gatekeeper
 gatekeeper_repo: "{{ base_repo }}{{ namespace_override | default('openpolicyagent') }}/gatekeeper"
 gatekeeper_release: "v3.5.2"
 
 #openpitrix:
+<<<<<<< HEAD
+openpitrix_job_tag: "v3.1.1"
+openpitrix_job_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/openpitrix-jobs"
+=======
 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"
+>>>>>>> upstream/master
 
 minio_repo: "{{ base_repo }}{{ namespace_override | default('minio') }}/minio"
 minio_tag: RELEASE.2019-08-07T01-59-21Z
@@ -94,18 +112,18 @@ 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 }}"
 
 #jenkins:
-jenkins_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-jenkins"
+jenkins_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-jenkins"
 jenkins_tag: v3.2.0-2.249.1
 jnlp_slave_repo: "{{ base_repo }}{{ namespace_override | default('jenkins') }}/jnlp-slave"
 jnlp_slave_tag: 3.27-1
 
-builder_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}"
+builder_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}"
 builder_base_tag: v3.2.0
 builder_nodejs_tag: v3.2.0
 builder_maven_tag: v3.2.0
@@ -121,7 +139,7 @@ builder_go_podman_tag: v3.2.0-podman
 builder_go16_podman_tag: v3.2.0-podman
 
 #s2i
-s2i_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}"
+s2i_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}"
 s2ioperator_tag: "v3.2.0"
 s2irun_tag: "v3.2.0"
 s2itemplates_tag: "v3.2.0"
@@ -153,24 +171,40 @@ grafana_tag: 7.4.3
 #notification-manager
 notification_manager_operator_proxy_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kube-rbac-proxy"
 notification_manager_operator_proxy_tag: v0.8.0
-notification_manager_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/notification-manager-operator"
+<<<<<<< HEAD
+notification_manager_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/notification-manager-operator"
+notification_manager_operator_tag: v1.0.0
+notification_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/notification-manager"
+notification_manager_tag: v1.0.0
+=======
+notification_manager_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/notification-manager-operator"
 notification_manager_operator_tag: v1.4.0
-notification_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/notification-manager"
+notification_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/notification-manager"
 notification_manager_tag: v1.4.0
 notification_tenant_sidecar_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/notification-tenant-sidecar"
 notification_tenant_sidecar_tag: v3.2.0
+>>>>>>> upstream/master
 
 #ks-logger
 docker_elasticsearch_curator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/elasticsearch-curator"
 docker_elasticsearch_curator_tag: v5.7.6
 elasticsearch_oss_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/elasticsearch-oss"
 elasticsearch_oss_tag: 6.7.0-1
 fluentbit_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/fluentbit-operator"
+<<<<<<< HEAD
+fluentbit_operator_tag: v0.5.0
+fluentbit_operator_migrator_tag: migrator
+docker_repo: "{{ base_library_repo }}docker"
+docker_tag: 19.03
+ks_fluent_bit_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/fluent-bit"
+ks_fluent_bit_tag: "v1.6.9"
+=======
 fluentbit_operator_tag: v0.11.0
 docker_repo: "{{ base_library_repo }}docker"
 docker_tag: 19.03
 ks_fluent_bit_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/fluent-bit"
 ks_fluent_bit_tag: "v1.8.3"
+>>>>>>> upstream/master
 ks_log_sidecar_injector_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/log-sidecar-injector"
 ks_log_sidecar_injector_tag: 1.1
 filebeat_repo: "{{ base_repo }}{{ namespace_override | default('elastic') }}/filebeat"
@@ -212,11 +246,19 @@ jaeger_collector_tag: 1.27
 jaeger_query_repo: "{{ base_repo }}{{ namespace_override | default('jaegertracing') }}/jaeger-query"
 jaeger_query_tag: 1.27
 jaeger_es_cleaner_repo: "{{ base_repo }}{{ namespace_override | default('jaegertracing') }}/jaeger-es-index-cleaner"
+<<<<<<< HEAD
+jaeger_es_cleaner_tag: 1.17
+kiali_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kiali-operator"
+kiali_operator_tag: v1.26.1
+kiali_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kiali"
+kiali_tag: v1.24
+=======
 jaeger_es_cleaner_tag: 1.27
 kiali_operator_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kiali-operator"
 kiali_operator_tag: v1.38.1
 kiali_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kiali"
 kiali_tag: v1.38
+>>>>>>> upstream/master
 
 #base:
 redis_repo: "{{ base_library_repo }}redis"

roles/ks-auditing/files/kube-auditing/README.md

@@ -33,28 +33,28 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the redis chart and their default values.
 
-Parameter | Description | Default
---- | --- | ---
-`operator.image.repository` | The image of kube-auditing operator | `kubespheredev/kube-auditing-operator`
-`operator.image.tag` | The tag of the kube-auditing operator image | `latest`
-`operator.image.pullPolicy` | The pull policy of the kube-auditing operator image | `IfNotPresent`
-`operator.image.pullSecrets` | The secret of the kube-auditing operator image | []
-`operator.resources` | The resource quota of the kube-auditing operator | {}
-`operator.nodeSelector` | The nodeSelector of the kube-auditing operator | {}
-`operator.tolerations` | The tolerations of the kube-auditing operator | []
-`operator.affinity` | The affinity of the kube-auditing operator | {}
-`webhook.name` | The name of the kube-auditing webhook | kube-auditing-webhook
-`webhook.replicas` | The replicas of the kube-auditing webhook | 1
-`webhook.image.repository` | The image of kube-auditing webhook | `kubespheredev/kube-auditing-webhook`
-`webhook.image.tag` | The tag of the kube-auditing webhook image | `latest`
-`webhook.image.pullPolicy` | The pull policy of the kube-auditing webhook image | `IfNotPresent`
-`webhook.image.pullSecrets` | The secret of the kube-auditing webhook image | []
-`webhook.args` | The args of the kube-auditing webhook | []
-`webhook.resources` | The resource quota of the kube-auditing webhook | {}
-`webhook.nodeSelector` | The nodeSelector of the kube-auditing webhook | {}
-`webhook.tolerations` | The tolerations of the kube-auditing webhook | []
-`webhook.affinity` | The affinity of the kube-auditing webhook | {}
-`webhook.receivers` | The receivers of the kube-auditing webhook | []
-`webhook.priority` | The priority of the kube-auditing webhook | DEBUG
-`webhook.auditType` | The auditType of the kube-auditing webhook | dynamic
-`webhook.auditLevel` | The auditLevel of the kube-auditing webhook | Metadata
+| Parameter                    | Description                                         | Default                             |
+|------------------------------|-----------------------------------------------------|-------------------------------------|
+| `operator.image.repository`  | The image of kube-auditing operator                 | `kubesphere/kube-auditing-operator` |
+| `operator.image.tag`         | The tag of the kube-auditing operator image         | `latest`                            |
+| `operator.image.pullPolicy`  | The pull policy of the kube-auditing operator image | `IfNotPresent`                      |
+| `operator.image.pullSecrets` | The secret of the kube-auditing operator image      | []                                  |
+| `operator.resources`         | The resource quota of the kube-auditing operator    | {}                                  |
+| `operator.nodeSelector`      | The nodeSelector of the kube-auditing operator      | {}                                  |
+| `operator.tolerations`       | The tolerations of the kube-auditing operator       | []                                  |
+| `operator.affinity`          | The affinity of the kube-auditing operator          | {}                                  |
+| `webhook.name`               | The name of the kube-auditing webhook               | kube-auditing-webhook               |
+| `webhook.replicas`           | The replicas of the kube-auditing webhook           | 1                                   |
+| `webhook.image.repository`   | The image of kube-auditing webhook                  | `kubesphere/kube-auditing-webhook`  |
+| `webhook.image.tag`          | The tag of the kube-auditing webhook image          | `latest`                            |
+| `webhook.image.pullPolicy`   | The pull policy of the kube-auditing webhook image  | `IfNotPresent`                      |
+| `webhook.image.pullSecrets`  | The secret of the kube-auditing webhook image       | []                                  |
+| `webhook.args`               | The args of the kube-auditing webhook               | []                                  |
+| `webhook.resources`          | The resource quota of the kube-auditing webhook     | {}                                  |
+| `webhook.nodeSelector`       | The nodeSelector of the kube-auditing webhook       | {}                                  |
+| `webhook.tolerations`        | The tolerations of the kube-auditing webhook        | []                                  |
+| `webhook.affinity`           | The affinity of the kube-auditing webhook           | {}                                  |
+| `webhook.receivers`          | The receivers of the kube-auditing webhook          | []                                  |
+| `webhook.priority`           | The priority of the kube-auditing webhook           | DEBUG                               |
+| `webhook.auditType`          | The auditType of the kube-auditing webhook          | dynamic                             |
+| `webhook.auditLevel`         | The auditLevel of the kube-auditing webhook         | Metadata                            |