merge main and fix up conflicts

labring · Jul 10, 2023 · 8f7f3d8 · 8f7f3d8
2 parents b4f0f05 + 0c00b99
commit 8f7f3d8
Show file tree

Hide file tree

Showing 58 changed files with 85 additions and 88 deletions.
diff --git a/.github/workflows/ci-patch-image.yml b/.github/workflows/ci-patch-image.yml
@@ -172,7 +172,7 @@ jobs:
       - name: Prepare
         id: prepare
         run: |
-          TAG=dev
+          TAG=latest
           echo tag_name=${GIT_COMMIT_SHORT_SHA} >> $GITHUB_OUTPUT
       - name: Renew issue and Sync Images
         uses: labring/[email protected]

diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml
@@ -11,8 +11,8 @@ on:
         type: boolean
         default: false
       push_image_tag:
-        description: 'Push all-in-one image tag, default is dev'
-        default: 'dev'
+        description: 'Push all-in-one image tag, default is latest'
+        default: 'latest'
         required: false
         type: string
       build_from:

diff --git a/.github/workflows/controllers.yml b/.github/workflows/controllers.yml
@@ -12,7 +12,7 @@ on:
         default: false
       push_image_tag:
         description: "Push image tag"
-        default: "dev"
+        default: "latest"
         required: false
         type: string
   push:
@@ -155,7 +155,6 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-            type=raw,value=dev,enable=true
             type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true
 
       - name: build (and publish) ${{ matrix.module.name }} main image
@@ -229,7 +228,7 @@ jobs:
       - name: Mutate image tag in deploy files
         working-directory: controllers/${{ matrix.module.path }}/deploy
         run: |
-          OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:dev
+          OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:latest
           NEW_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.new_docker_repo }}:${{ steps.prepare.outputs.tag_name }}
           sudo sed -i "s;${OLD_DOCKER_IMAGE_NAME};${NEW_DOCKER_IMAGE_NAME};" manifests/*
 

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -12,7 +12,7 @@ on:
         default: false
       push_image_tag:
         description: "Push image tag"
-        default: "dev"
+        default: "latest"
         required: false
         type: string
   push:
@@ -87,7 +87,6 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-            type=raw,value=dev,enable=true
             type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true
 
       - name: Set up QEMU
@@ -160,7 +159,7 @@ jobs:
         run: |
           tag_name=$(bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}"  "${{ inputs.push_image_tag }}")
           echo old_docker_repo=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
-          echo old_docker_image=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend:dev >> $GITHUB_OUTPUT
+          echo old_docker_image=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend:latest >> $GITHUB_OUTPUT
           echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
           echo new_docker_image=ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend:${tag_name} >> $GITHUB_OUTPUT
           echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT

diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml
@@ -13,7 +13,7 @@ on:
         default: false
       push_image_tag:
         description: 'Push image tag'
-        default: 'dev'
+        default: 'latest'
         required: false
         type: string
   push:
@@ -144,7 +144,6 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-            type=raw,value=dev,enable=true
             type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true
 
       - name: build (and publish) ${{ matrix.module }} main image
@@ -212,7 +211,7 @@ jobs:
       - name: Mutate image tag in deploy files
         working-directory: service/${{ matrix.module }}/deploy
         run: |
-          OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:dev
+          OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:latest
           NEW_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.new_docker_repo }}:${{ steps.prepare.outputs.tag_name }}
           sed -i "s;${OLD_DOCKER_IMAGE_NAME};${NEW_DOCKER_IMAGE_NAME};" manifests/*
 

diff --git a/.github/workflows/webhooks.yml b/.github/workflows/webhooks.yml
@@ -99,7 +99,7 @@ jobs:
       - name: Prepare
         id: prepare
         run: |
-          TAG=dev
+          TAG=latest
           echo tag_name=${TAG} >> $GITHUB_OUTPUT
 
       - # Add support for more platforms with QEMU (optional)

diff --git a/controllers/account/Makefile b/controllers/account/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-account-controller:dev
+IMG ?= ghcr.io/labring/sealos-account-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
 

diff --git a/controllers/account/config/default/manager_auth_proxy_patch.yaml b/controllers/account/config/default/manager_auth_proxy_patch.yaml
@@ -65,9 +65,9 @@ spec:
             value: "604800"
           - name: DebtDetectionCycleSeconds
             value: "300"
-        image: ghcr.io/labring/sealos-account-controller:dev
+        image: ghcr.io/labring/sealos-account-controller:latest
         imagePullPolicy: Always
         args:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=127.0.0.1:8080"
-        - "--leader-elect"
+        - "--leader-elect"
diff --git a/controllers/account/deploy/manifests/deploy.yaml b/controllers/account/deploy/manifests/deploy.yaml
@@ -1156,7 +1156,7 @@ spec:
         envFrom:
         - secretRef:
             name: payment-secret
-        image: ghcr.io/labring/sealos-account-controller:dev
+        image: ghcr.io/labring/sealos-account-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/app/Makefile b/controllers/app/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-app-controller:dev
+IMG ?= ghcr.io/labring/sealos-app-controller:latest
 TARGETARCH ?= amd64
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

diff --git a/controllers/app/deploy/manifests/deploy.yaml b/controllers/app/deploy/manifests/deploy.yaml
@@ -406,7 +406,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/labring/sealos-app-controller:dev
+        image: ghcr.io/labring/sealos-app-controller:latest
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/controllers/cloud/deploy/manifests/deploy.yaml.tmpl b/controllers/cloud/deploy/manifests/deploy.yaml.tmpl
@@ -601,7 +601,7 @@ spec:
         env:
         - name: CAN_CONNECT_TO_EXTERNAL_NETWORK
           value: '{{ .canConnectToExternalNetwork }}'
-        image: ghcr.io/labring/sealos-cloud-controller:dev
+        image: ghcr.io/labring/sealos-cloud-controller:latest
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/controllers/cluster/Makefile b/controllers/cluster/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-cluster-controller:dev
+IMG ?= ghcr.io/labring/sealos-cluster-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.2
 

diff --git a/controllers/cluster/deploy/manifests/deploy.yaml b/controllers/cluster/deploy/manifests/deploy.yaml
@@ -443,7 +443,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/labring/sealos-cluster-controller:dev
+        image: ghcr.io/labring/sealos-cluster-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/db/adminer/Makefile b/controllers/db/adminer/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-db-adminer-controller:dev
+IMG ?= ghcr.io/labring/sealos-db-adminer-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.1
 

diff --git a/controllers/db/adminer/deploy/README.md b/controllers/db/adminer/deploy/README.md
@@ -1,11 +1,11 @@
 ### How to build image
 
 ```shell
-sealos build -t docker.io/labring/sealos-db-adminer-controller:dev -f Dockerfile .
+sealos build -t docker.io/labring/sealos-db-adminer-controller:latest -f Dockerfile .
 ```
 
 ### How to run
 
 ```shell
-sealos run  docker.io/labring/sealos-db-adminer-controller:dev
+sealos run  docker.io/labring/sealos-db-adminer-controller:latest
 ```
diff --git a/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl b/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl
@@ -397,7 +397,7 @@ spec:
           value: {{ .wildcardCertSecretName }}
         - name: SECRET_NAMESPACE
           value: {{ .wildcardCertSecretNamespace }}
-        image: ghcr.io/labring/sealos-db-adminer-controller:dev
+        image: ghcr.io/labring/sealos-db-adminer-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/db/bytebase/deploy/README.md b/controllers/db/bytebase/deploy/README.md
@@ -1,11 +1,11 @@
 ### How to build image
 
 ```shell
-sealos build -t docker.io/labring/sealos-db-bytebase-controller:dev -f Dockerfile .
+sealos build -t docker.io/labring/sealos-db-bytebase-controller:latest -f Dockerfile .
 ```
 
 ### How to run
 
 ```shell
-sealos run  docker.io/labring/sealos-db-bytebase-controller:dev
+sealos run  docker.io/labring/sealos-db-bytebase-controller:latest
 ```
diff --git a/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl b/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl
@@ -512,7 +512,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/labring/sealos-db-bytebase-controller:dev
+        image: ghcr.io/labring/sealos-db-bytebase-controller:latest
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/controllers/imagehub/Makefile b/controllers/imagehub/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-imagehub-controller:dev
+IMG ?= ghcr.io/labring/sealos-imagehub-controller:latest
 TARGETARCH ?= amd64
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

diff --git a/controllers/imagehub/deploy/manifests/deploy.yaml b/controllers/imagehub/deploy/manifests/deploy.yaml
@@ -867,7 +867,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/labring/sealos-imagehub-controller:dev
+        image: ghcr.io/labring/sealos-imagehub-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/infra/Makefile b/controllers/infra/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-infra-controller:dev
+IMG ?= ghcr.io/labring/sealos-infra-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.1
 

diff --git a/controllers/infra/deploy/README.md b/controllers/infra/deploy/README.md
@@ -21,7 +21,7 @@ data:
 
 ### 部署方式
 ```
-sealos run docker.io/labring/sealos-account-controller:dev
+sealos run docker.io/labring/sealos-account-controller:latest
 
 ```
 
diff --git a/controllers/infra/deploy/manifests/deploy.yaml b/controllers/infra/deploy/manifests/deploy.yaml
@@ -603,7 +603,7 @@ spec:
         envFrom:
         - secretRef:
             name: infra-secret
-        image: ghcr.io/labring/sealos-infra-controller:dev
+        image: ghcr.io/labring/sealos-infra-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/metering/Makefile b/controllers/metering/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-metering-controller:dev
+IMG ?= ghcr.io/labring/sealos-metering-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
 

diff --git a/controllers/metering/deploy/manifests/deploy.yaml b/controllers/metering/deploy/manifests/deploy.yaml
@@ -567,7 +567,7 @@ spec:
         envFrom:
         - configMapRef:
             name: metering-manager-configmap
-        image: ghcr.io/labring/sealos-metering-controller:dev
+        image: ghcr.io/labring/sealos-metering-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/controllers/resources/Makefile b/controllers/resources/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-resources-controller:dev
+IMG ?= ghcr.io/labring/sealos-resources-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
 

diff --git a/controllers/resources/config/manager/manager.yaml b/controllers/resources/config/manager/manager.yaml
@@ -35,7 +35,7 @@ spec:
               secretKeyRef:
                 name: mongo-secret
                 key: MONGO_URI
-        image: ghcr.io/labring/sealos-resources-controller:dev
+        image: ghcr.io/labring/sealos-resources-controller:latest
         imagePullPolicy: Always
         name: manager
         securityContext:

diff --git a/controllers/resources/deploy/README.md b/controllers/resources/deploy/README.md
@@ -2,7 +2,7 @@
 
 ```shell
 # 需要传入完整的包含username passwd的mongo uri来创建secret：
-sealos run ghcr.io/labring/sealos-cloud-resources-controller:dev --env MONGO_URI="mongodb://username:passwd@ip:port/sealos-resources?authSource=admin"
+sealos run ghcr.io/labring/sealos-cloud-resources-controller:latest --env MONGO_URI="mongodb://username:passwd@ip:port/sealos-resources?authSource=admin"
 ```
 
-> 目前默认使用mongodb作为存储: sealos-resources 为数据库名
+> 目前默认使用mongodb作为存储: sealos-resources 为数据库名
diff --git a/controllers/resources/deploy/manifests/deploy-manager.yaml b/controllers/resources/deploy/manifests/deploy-manager.yaml
@@ -55,7 +55,7 @@ spec:
                 secretKeyRef:
                   key: MONGO_URI
                   name: mongo-secret
-          image: ghcr.io/labring/sealos-resources-controller:dev
+          image: ghcr.io/labring/sealos-resources-controller:latest
           imagePullPolicy: Always
           livenessProbe:
             httpGet:
@@ -82,4 +82,4 @@ spec:
       securityContext:
         runAsNonRoot: true
       serviceAccountName: resources-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
diff --git a/controllers/resources/metering/Makefile b/controllers/resources/metering/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-resources-controller:dev
+IMG ?= ghcr.io/labring/sealos-resources-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
 
@@ -47,4 +47,4 @@ endif
 ## Location to install dependencies to
 LOCALBIN ?= $(shell pwd)/bin
 $(LOCALBIN):
-	mkdir -p $(LOCALBIN)
+	mkdir -p $(LOCALBIN)
diff --git a/controllers/resources/metering/deploy/manifests/deploy.yaml b/controllers/resources/metering/deploy/manifests/deploy.yaml
@@ -23,7 +23,7 @@ spec:
         control-plane: metering-manager
     spec:
       containers:
-        - image: ghcr.io/labring/sealos-resources-metering-controller:dev
+        - image: ghcr.io/labring/sealos-resources-metering-controller:latest
           name: resource-metering
           command:
             - "/manager"
@@ -49,4 +49,4 @@ spec:
                 secretKeyRef:
                   name: mongo-secret
                   key: MONGO_URI
-          imagePullPolicy: Always
+          imagePullPolicy: Always
diff --git a/controllers/terminal/Makefile b/controllers/terminal/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/labring/sealos-terminal-controller:dev
+IMG ?= ghcr.io/labring/sealos-terminal-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.1
 

diff --git a/controllers/terminal/deploy/README.md b/controllers/terminal/deploy/README.md
@@ -1,11 +1,11 @@
 ### How to build image
 
 ```shell
-sealos build -t docker.io/labring/sealos-terminal-controller:dev -f Dockerfile .
+sealos build -t docker.io/labring/sealos-terminal-controller:latest -f Dockerfile .
 ```
 
 ### How to run
 
 ```shell
-sealos run  docker.io/labring/sealos-terminal-controller:dev
+sealos run  docker.io/labring/sealos-terminal-controller:latest
 ```
diff --git a/controllers/terminal/deploy/manifests/deploy.yaml.tmpl b/controllers/terminal/deploy/manifests/deploy.yaml.tmpl
@@ -447,7 +447,7 @@ spec:
           value: {{ .wildcardCertSecretName }}
         - name: SECRET_NAMESPACE
           value: {{ .wildcardCertSecretNamespace }}
-        image: ghcr.io/labring/sealos-terminal-controller:dev
+        image: ghcr.io/labring/sealos-terminal-controller:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet: