chore: Join Kaniko task for ECR and Harbor into one (#47)

Jira EPMDEDP-12618 Related #47 Change-Id: I2174845e6c8351e891c451f25213a1a873c55aba
epam · Oct 12, 2023 · 2d1d4c0 · 2d1d4c0
1 parent b37b165
commit 2d1d4c0
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 3,232 deletions.
diff --git a/charts/pipelines-library/templates/pipelines/_common_docker.yaml b/charts/pipelines-library/templates/pipelines/_common_docker.yaml
@@ -1,34 +1,4 @@
 {{- define "build-pipeline-docker-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - dockerfile-lint
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -42,8 +12,10 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
+
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
diff --git a/charts/pipelines-library/templates/pipelines/_common_dotnet.yaml b/charts/pipelines-library/templates/pipelines/_common_dotnet.yaml
@@ -382,36 +382,6 @@
 {{- end -}}
 
 {{- define "build-pipeline-dotnet-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - dotnet-publish
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -425,8 +395,9 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
diff --git a/charts/pipelines-library/templates/pipelines/_common_go.yaml b/charts/pipelines-library/templates/pipelines/_common_go.yaml
@@ -64,36 +64,6 @@
 {{- end -}}
 
 {{- define "build-pipeline-golang-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - build
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -107,10 +77,11 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
 
 {{- define "golang-review-common" -}}

diff --git a/charts/pipelines-library/templates/pipelines/_common_java_gradle.yaml b/charts/pipelines-library/templates/pipelines/_common_java_gradle.yaml
@@ -191,36 +191,6 @@
 {{- end -}}
 
 {{- define "build-pipeline-java-gradle-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - push
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -234,8 +204,9 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
diff --git a/charts/pipelines-library/templates/pipelines/_common_java_maven.yaml b/charts/pipelines-library/templates/pipelines/_common_java_maven.yaml
@@ -259,46 +259,13 @@
 {{- end -}}
 
 {{- define "build-pipeline-java-maven-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - push
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
 - name: kaniko-build
   taskRef:
     kind: Task
     name: kaniko
   runAfter:
     - get-maven-module
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-    - name: CONTEXT
-      value: "$(tasks.get-maven-module.results.DEPLOYABLE_MODULE_DIR)"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
     - push
-    - get-maven-module
   params:
     - name: IMAGE
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
@@ -308,8 +275,9 @@
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
     - name: CONTEXT
       value: "$(tasks.get-maven-module.results.DEPLOYABLE_MODULE_DIR)"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
diff --git a/charts/pipelines-library/templates/pipelines/_common_js_npm.yaml b/charts/pipelines-library/templates/pipelines/_common_js_npm.yaml
@@ -239,36 +239,6 @@
 {{- end -}}
 
 {{- define "build-pipeline-js-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - push
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -285,40 +255,9 @@
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
 
 {{- define "build-pipeline-antora-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - build
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -332,8 +271,9 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}
diff --git a/charts/pipelines-library/templates/pipelines/_common_python.yaml b/charts/pipelines-library/templates/pipelines/_common_python.yaml
@@ -162,36 +162,6 @@
 {{- end -}}
 
 {{- define "build-pipeline-python-image-build-push-common" -}}
-{{- if eq .Values.global.dockerRegistry.type "ecr" }}
-- name: create-ecr-repository
-  taskRef:
-    kind: Task
-    name: create-ecr-repository
-  runAfter:
-    - push
-  params:
-    - name: REPO_NAME
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
-
-- name: kaniko-build
-  taskRef:
-    kind: Task
-    name: kaniko
-  runAfter:
-    - create-ecr-repository
-  params:
-    - name: IMAGE
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)"
-    - name: IMAGE_TAR
-      value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
-    - name: KANIKO_CACHE_REPO
-      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
-  workspaces:
-    - name: source
-      workspace: shared-workspace
-{{- end }}
-
-{{- if or (eq .Values.global.dockerRegistry.type "harbor") (eq .Values.global.dockerRegistry.type "dockerhub") }}
 - name: kaniko-build
   taskRef:
     kind: Task
@@ -205,8 +175,9 @@
       value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)"
     - name: KANIKO_CACHE_REPO
       value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache"
+    - name: REPO_NAME
+      value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)"
   workspaces:
     - name: source
       workspace: shared-workspace
-{{- end }}
 {{- end -}}