fix(dockerfiles/cd/builders): fix skaffold config files

Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Jan 8, 2025 · 8718473 · 8718473
1 parent 8e057e4
commit 8718473
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 49 deletions.
diff --git a/.github/workflows/pull-cd-builder-images-centos7.yaml b/.github/workflows/pull-cd-builder-images-centos7.yaml
@@ -91,7 +91,15 @@ jobs:
         profile: [go-1.23, go-1.22, go-1.21, go-1.20, go-1.19]
         platform: [linux/amd64, linux/arm64]
         builder: ${{ fromJSON(needs.define-matrix.outputs.changed_go_builder_folders) }}
-
+        exclude:
+          - builder: ticdc
+            profile: go-1.22
+          - builder: ticdc
+            profile: go-1.21
+          - builder: ticdc
+            profile: go-1.20
+          - builder: ticdc
+            profile: go-1.19
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

diff --git a/.github/workflows/release-cd-builder-images-centos7.yaml b/.github/workflows/release-cd-builder-images-centos7.yaml
@@ -91,6 +91,15 @@ jobs:
         module: [builder-go]
         profile: [go-1.23, go-1.22, go-1.21, go-1.20, go-1.19]
         builder: ${{ fromJSON(needs.define-matrix.outputs.changed_go_builder_folders) }}
+        exclude:
+          - builder: ticdc
+            profile: go-1.22
+          - builder: ticdc
+            profile: go-1.21
+          - builder: ticdc
+            profile: go-1.20
+          - builder: ticdc
+            profile: go-1.19
 
     steps:
       - name: Checkout sources

diff --git a/dockerfiles/cd/builders/ng-monitoring/skaffold-centos7.yaml b/dockerfiles/cd/builders/ng-monitoring/skaffold-centos7.yaml
@@ -30,7 +30,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -39,7 +40,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -48,7 +50,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
   - name: go-1.20
     patches:
@@ -57,7 +59,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.20"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-20
+        value:
           GOLANG_VERSION: 1.20.14
   - name: go-1.19
     patches:
@@ -66,5 +68,5 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.19"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-19
+        value:
           GOLANG_VERSION: 1.19.13
diff --git a/dockerfiles/cd/builders/ng-monitoring/skaffold.yaml b/dockerfiles/cd/builders/ng-monitoring/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
diff --git a/dockerfiles/cd/builders/pd/skaffold-centos7.yaml b/dockerfiles/cd/builders/pd/skaffold-centos7.yaml
@@ -30,7 +30,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -39,7 +40,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -48,7 +50,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
   - name: go-1.20
     patches:
@@ -57,7 +59,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.20"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-20
+        value:
           GOLANG_VERSION: 1.20.14
   - name: go-1.19
     patches:
@@ -66,5 +68,5 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.19"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-19
+        value:
           GOLANG_VERSION: 1.19.13
diff --git a/dockerfiles/cd/builders/pd/skaffold.yaml b/dockerfiles/cd/builders/pd/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
diff --git a/dockerfiles/cd/builders/tem/skaffold.yaml b/dockerfiles/cd/builders/tem/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
diff --git a/dockerfiles/cd/builders/ticdc/skaffold-centos7.yaml b/dockerfiles/cd/builders/ticdc/skaffold-centos7.yaml
@@ -30,5 +30,6 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
diff --git a/dockerfiles/cd/builders/ticdc/skaffold.yaml b/dockerfiles/cd/builders/ticdc/skaffold.yaml
@@ -31,5 +31,6 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold-centos7.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold-centos7.yaml
@@ -30,7 +30,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -39,7 +40,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -48,7 +50,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
   - name: go-1.20
     patches:
@@ -57,7 +59,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.20"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-20
+        value:
           GOLANG_VERSION: 1.20.14
   - name: go-1.19
     patches:
@@ -66,5 +68,5 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.19"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-19
+        value:
           GOLANG_VERSION: 1.19.13
diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
diff --git a/dockerfiles/cd/builders/tidb-operator/skaffold.yaml b/dockerfiles/cd/builders/tidb-operator/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
diff --git a/dockerfiles/cd/builders/tidb/skaffold-centos7.yaml b/dockerfiles/cd/builders/tidb/skaffold-centos7.yaml
@@ -30,7 +30,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -39,7 +40,8 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -48,7 +50,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13
   - name: go-1.20
     patches:
@@ -57,7 +59,7 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.20"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-20
+        value:
           GOLANG_VERSION: 1.20.14
   - name: go-1.19
     patches:
@@ -66,5 +68,5 @@ profiles:
         value: "{{ .SHA }}-centos7-go1.19"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-19
+        value:
           GOLANG_VERSION: 1.19.13
diff --git a/dockerfiles/cd/builders/tidb/skaffold.yaml b/dockerfiles/cd/builders/tidb/skaffold.yaml
@@ -31,7 +31,8 @@ profiles:
         value: "{{ .SHA }}-go1.23"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-23 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.23.4
   - name: go-1.22
     patches:
@@ -40,7 +41,8 @@ profiles:
         value: "{{ .SHA }}-go1.22"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-22 # renovate: datasource=docker depName=golang
+        value:
+          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.22.10
   - name: go-1.21
     patches:
@@ -49,5 +51,5 @@ profiles:
         value: "{{ .SHA }}-go1.21"
       - op: add
         path: /build/artifacts/0/docker/buildArgs
-        value: &value-go1-21
+        value:
           GOLANG_VERSION: 1.21.13