chore: Standardize Tekton Agents Image Versions (#367)

epam · Nov 21, 2024 · 9b56dca · 9b56dca
1 parent b20963c
commit 9b56dca
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 45 deletions.
diff --git a/charts/pipelines-library/templates/pipelines/python/flask/github-build-default.yaml b/charts/pipelines-library/templates/pipelines/python/flask/github-build-default.yaml
@@ -39,10 +39,6 @@ spec:
       description: Change number from Merge Request
       default: ""
       type: string
-    - name: image
-      default: '{{ $registry }}/python:3.8-alpine3.16'
-      description: "python image version"
-      type: string
     - name: TICKET_NAME_PATTERN
       description: "Ticket name pattern"
       default: ""

diff --git a/charts/pipelines-library/templates/pipelines/python/flask/github-review.yaml b/charts/pipelines-library/templates/pipelines/python/flask/github-review.yaml
@@ -47,10 +47,6 @@ spec:
     - name: CODEBASEBRANCH_NAME
       description: "Codebasebranch name"
       type: string
-    - name: image
-      default: '{{ $registry }}/python:3.8-alpine3.16'
-      description: "python image version"
-      type: string
     - name: gitfullrepositoryname
       description: "repository full name"
       type: string

diff --git a/charts/pipelines-library/templates/tasks/autotest-cd-pipeline/init-autotests.yaml b/charts/pipelines-library/templates/tasks/autotest-cd-pipeline/init-autotests.yaml
@@ -24,14 +24,17 @@ spec:
       default: 'codebase_tags'
     - name: parent-pipeline-name
       default: ''
+    - name: step_init_autotest_image
+      description: "The base image for the task."
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   results:
     - name: AUTOTEST_PIPELINES
       type: string
     - name: codebase_tags
       type: string
   steps:
     - name: init-autotest
-      image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+      image: $(params.step_init_autotest_image)
       workingDir: $(workspaces.source.path)
       volumeMounts:
         - name: autotests-workspace-template

diff --git a/charts/pipelines-library/templates/tasks/autotest-cd-pipeline/wait-autotest.yaml b/charts/pipelines-library/templates/tasks/autotest-cd-pipeline/wait-autotest.yaml
@@ -12,9 +12,12 @@ spec:
   params:
     - name: AUTOTEST_PIPELINES
       default: 'autotes-pipeline'
+    - name: step_wait_for_image
+      description: "The base image for the task."
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   steps:
     - name: wait-for
-      image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+      image: $(params.step_wait_for_image)
       workingDir: $(workspaces.source.path)
       env:
         - name: AUTOTEST_PIPELINES

diff --git a/charts/pipelines-library/templates/tasks/autotests/TestsMavenAutotest.yaml b/charts/pipelines-library/templates/tasks/autotests/TestsMavenAutotest.yaml
@@ -23,12 +23,18 @@ spec:
       default: ci-nexus
     - name: BASE_IMAGE
       description: "The base image for the task"
+    - name: step_get_command_image
+      description: "The command to run autotests"
+      default: '{{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16'
+    - name: step_check_run_json_file_image
+      description: "The image to check the presence of the run.json file"
+      default: '{{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16'
   results:
     - name: COMMAND
       type: string
   steps:
     - name: check-run-json-file
-      image: "{{ include "edp-tekton.registry" . }}/python:3.9.14-alpine3.16"
+      image: $(params.step_check_run_json_file_image)
       workingDir: $(workspaces.source.path)
       script: |
         set -ex
@@ -41,7 +47,7 @@ spec:
         fi
 
     - name: get-command
-      image: "{{ include "edp-tekton.registry" . }}/python:3.10.1-alpine3.15"
+      image: $(params.step_get_command_image)
       workingDir: $(workspaces.source.path)
       env:
         - name: RESULT_COMMAND_FILE_PATH

diff --git a/charts/pipelines-library/templates/tasks/bitbucket-set-status.yaml b/charts/pipelines-library/templates/tasks/bitbucket-set-status.yaml
@@ -79,7 +79,7 @@ spec:
       description: |
         Image providing the python binary which this task uses.
       type: string
-      default: {{ include "edp-tekton.registry" . }}/python:3.10.1-alpine3.15
+      default: {{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16
     - name: SHEBANG
       description: |
         Python path. Depends on the image.

diff --git a/charts/pipelines-library/templates/tasks/commit-validate.yaml b/charts/pipelines-library/templates/tasks/commit-validate.yaml
@@ -18,7 +18,7 @@ spec:
       description: "Pattern to validate a commit message"
     - name: BASE_IMAGE
       description: "The base image for the task."
-      default: "{{ include "edp-tekton.registry" . }}/python:3.10.1-alpine3.15"
+      default: "{{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16"
     - name: MAX_LINE_LENGTH
       description: "Maximum length of each line in the commit message."
       default: "80"

diff --git a/charts/pipelines-library/templates/tasks/getversion/defaulttype/UpdateBuildNumberNpm.yaml b/charts/pipelines-library/templates/tasks/getversion/defaulttype/UpdateBuildNumberNpm.yaml
@@ -15,7 +15,7 @@ spec:
       description: "Version"
     - name: BASE_IMAGE
       description: "The base image for the task"
-      default: "{{ include "edp-tekton.registry" . }}/node:18.9.0"
+      default: "{{ include "edp-tekton.registry" . }}/library/node:18.20.3-alpine3.20"
   steps:
     - name: update-build-number
       image: $(params.BASE_IMAGE)

diff --git a/charts/pipelines-library/templates/tasks/getversion/edptype/GetVersionEDP.yaml b/charts/pipelines-library/templates/tasks/getversion/edptype/GetVersionEDP.yaml
@@ -10,6 +10,9 @@ spec:
     - name: CODEBASEBRANCH_NAME
       type: string
       description: "Codebasebranch name"
+    - name: step_get_version_image
+      description: "The base image for the task"
+      default: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
   results:
     - name: VERSION
       description: "Application version"
@@ -29,7 +32,7 @@ spec:
     - name: DEPLOYABLE_MODULE_DIR
   steps:
     - name: get-version
-      image: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.2
+      image: $(params.step_get_version_image)
       env:
         - name: CODEBASEBRANCH_NAME
           value: "$(params.CODEBASEBRANCH_NAME)"

diff --git a/charts/pipelines-library/templates/tasks/getversion/edptype/UpdateBuildNumberNpm.yaml b/charts/pipelines-library/templates/tasks/getversion/edptype/UpdateBuildNumberNpm.yaml
@@ -18,7 +18,7 @@ spec:
       description: "Version"
     - name: BASE_IMAGE
       description: "The base image for the task"
-      default: "{{ include "edp-tekton.registry" . }}/node:18.9.0"
+      default: "{{ include "edp-tekton.registry" . }}/library/node:18.20.3-alpine3.20"
   steps:
     - name: update-build-number
       image: $(params.BASE_IMAGE)

diff --git a/charts/pipelines-library/templates/tasks/github-set-status.yaml b/charts/pipelines-library/templates/tasks/github-set-status.yaml
@@ -85,7 +85,7 @@ spec:
       description: |
         Image providing the python binary which this task uses.
       type: string
-      default: {{ include "edp-tekton.registry" . }}/python:3.10.1-alpine3.15
+      default: {{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16
     - name: SHEBANG
       description: |
         Python path. Depends on the image.

diff --git a/charts/pipelines-library/templates/tasks/helm-docs.yaml b/charts/pipelines-library/templates/tasks/helm-docs.yaml
@@ -23,6 +23,9 @@ spec:
     - name: helm_docs_image
       description: "Specify a specific helm-docs image"
       default: "{{ include "edp-tekton.registry" . }}/jnorwood/helm-docs:v1.13.1"
+    - name: git_image
+      description: "Specify a specific git image"
+      default: "{{ include "edp-tekton.registry" . }}/alpine/git:v2.26.2"
     - name: user_home
       description: |
         Absolute path to the user's home directory. Set this explicitly if you are running the image as a non-root user
@@ -50,7 +53,7 @@ spec:
 
         helm-docs --chart-search-root ${CHART_DIR}
     - name: validate-helm-docs
-      image: {{ include "edp-tekton.registry" . }}/bitnami/git:2.41.0
+      image: $(params.git_image)
       workingDir: $(workspaces.source.path)
       env:
         - name: CHART_DIR

diff --git a/charts/pipelines-library/templates/tasks/helm-libraries/helm-docs-lib.yaml b/charts/pipelines-library/templates/tasks/helm-libraries/helm-docs-lib.yaml
@@ -20,17 +20,20 @@ spec:
     - name: CHART_DIR
       description: The directory in source that contains the helm chart
       default: "."
-    - name: helm_docs_image
+    - name: step_helm_docs_image
       description: "Specify a specific helm-docs image"
       default: "{{ include "edp-tekton.registry" . }}/jnorwood/helm-docs:v1.13.1"
+    - name: step_validate_helm_docs_image
+      description: "Specify a specific git image"
+      default: "{{ include "edp-tekton.registry" . }}/alpine/git:v2.26.2"
     - name: user_home
       description: |
         Absolute path to the user's home directory. Set this explicitly if you are running the image as a non-root user
       type: string
       default: "/tekton/home"
   steps:
     - name: helm-docs
-      image: $(params.helm_docs_image)
+      image: $(params.step_helm_docs_image)
       workingDir: $(workspaces.source.path)
       env:
         - name: CHART_DIR
@@ -55,7 +58,7 @@ spec:
         helm-docs --chart-search-root ${CHART_DIR}
 
     - name: validate-helm-docs
-      image: bitnami/git:2.41.0
+      image: $(params.step_validate_helm_docs_image)
       workingDir: $(workspaces.source.path)
       env:
         - name: CHART_DIR

diff --git a/charts/pipelines-library/templates/tasks/init-values.yaml b/charts/pipelines-library/templates/tasks/init-values.yaml
@@ -18,7 +18,7 @@ spec:
     - name: BASE_IMAGE
       description: The base image for the task.
       type: string
-      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.2
+      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4
   results:
     - name: TENANT_NAME
       description: "edp name"

diff --git a/charts/pipelines-library/templates/tasks/opa.yaml b/charts/pipelines-library/templates/tasks/opa.yaml
@@ -26,12 +26,20 @@ spec:
     - name: JUNIT_SCRIPT
       type: string
       default: '/workspace/opa_test_to_junit.py'
-    - name: EXTRA_COMMANDS
+    - name: step_download_image
+      type: string
+      default: "{{ include "edp-tekton.registry" . }}/alpine/curl:3.14"
+      description: The opa image.
+    - name: step_convert_image
       type: string
+      default: "{{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16"
+      description: The opa image.
     - name: BASE_IMAGE
       type: string
       default: "{{ include "edp-tekton.registry" . }}/openpolicyagent/opa:0.45.0-debug"
       description: The opa image.
+    - name: EXTRA_COMMANDS
+      type: string
   steps:
     - name: opa-results-json
       image: $(params.BASE_IMAGE)
@@ -44,7 +52,7 @@ spec:
         set -e
         opa test --bundle ./ --format json > "${OPA_RESULTS}"
         cat "${OPA_RESULTS}"
-    - image: {{ include "edp-tekton.registry" . }}/curlimages/curl:7.85.0
+    - image: $(params.step_download_image)
       name: download-converter
       workingDir: $(workspaces.source.path)/$(params.PROJECT_DIR)
       env:
@@ -56,7 +64,7 @@ spec:
             -o "${JUNIT_SCRIPT}"
         cat "${JUNIT_SCRIPT}"
     - name: convert-to-xml
-      image: '{{ include "edp-tekton.registry" . }}/python:3.10.8-alpine3.16'
+      image: $(params.step_convert_image)
       workingDir: $(workspaces.source.path)/$(params.PROJECT_DIR)
       env:
         - name: OPA_RESULTS

diff --git a/charts/pipelines-library/templates/tasks/push-to-jira.yaml b/charts/pipelines-library/templates/tasks/push-to-jira.yaml
@@ -30,9 +30,13 @@ spec:
     - name: GIT_URL
       description: Repository URL to clone from.
       type: string
+    - name: step_push_to_jira_image
+      description: "The base image for the task."
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
+      type: string
   steps:
     - name: push-to-jira
-      image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+      image: $(params.step_push_to_jira_image)
       env:
         - name: GIT_URL
           value: $(params.GIT_URL)

diff --git a/charts/pipelines-library/templates/tasks/send-to-microsoft-teams.yaml b/charts/pipelines-library/templates/tasks/send-to-microsoft-teams.yaml
@@ -19,9 +19,13 @@ spec:
   - name: message
     type: string
     description: The message to notify about
+  - name: base_image
+    type: string
+    description: The image to use as a base for the task
+    default: "{{ include "edp-tekton.registry" . }}/alpine/curl:3.14"
   steps:
   - name: post
-    image: {{ include "edp-tekton.registry" . }}/curlimages/curl:7.70.0 #@sha256:031df77a11e5edded840bc761a845eab6e3c2edee22669fb8ad6d59484b6a1c4
+    image: $(params.base_image)
     script: |
       #!/usr/bin/env sh
       MESSAGE=$(echo "${MESSAGE}" | sed -e 's/\"/\\\\"/g')

diff --git a/charts/pipelines-library/templates/tasks/sonar/sonarqube-dotnet.yaml b/charts/pipelines-library/templates/tasks/sonar/sonarqube-dotnet.yaml
@@ -61,8 +61,11 @@ spec:
       default: "."
     - name: EXTRA_COMMANDS
       type: string
+    - name: step_prepare_project_image
+      type: string
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   steps:
-    - image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+    - image: $(params.step_prepare_project_image)
       name: prepare-project
       workingDir: $(workspaces.source.path)
       env:

diff --git a/charts/pipelines-library/templates/tasks/sonar/sonarqube-general.yaml b/charts/pipelines-library/templates/tasks/sonar/sonarqube-general.yaml
@@ -51,8 +51,11 @@ spec:
       type: string
       description: Change number from Merge Request
       default: ""
+    - name: step_prepare_project_image
+      type: string
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   steps:
-    - image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+    - image: $(params.step_prepare_project_image)
       name: prepare-project
       workingDir: $(workspaces.source.path)
       env:

diff --git a/charts/pipelines-library/templates/tasks/sonar/sonarqube-gradle.yaml b/charts/pipelines-library/templates/tasks/sonar/sonarqube-gradle.yaml
@@ -69,8 +69,11 @@ spec:
       default: "."
     - name: EXTRA_COMMANDS
       type: string
+    - name: step_prepare_project_image
+      type: string
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   steps:
-    - image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+    - image: $(params.step_prepare_project_image)
       name: prepare-project
       workingDir: $(workspaces.source.path)
       env:

diff --git a/charts/pipelines-library/templates/tasks/sonar/sonarqube-maven.yaml b/charts/pipelines-library/templates/tasks/sonar/sonarqube-maven.yaml
@@ -74,8 +74,11 @@ spec:
       type: array
       default:
         - "package"
+    - name: step_prepare_project_image
+      type: string
+      default: "{{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.6"
   steps:
-    - image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
+    - image: $(params.step_prepare_project_image)
       name: prepare-project
       workingDir: $(workspaces.source.path)
       env:

diff --git a/charts/pipelines-library/templates/tasks/update-cbb.yaml b/charts/pipelines-library/templates/tasks/update-cbb.yaml
@@ -17,7 +17,7 @@ spec:
     - name: BASE_IMAGE
       description: The base image for the task.
       type: string
-      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.2
+      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4
   steps:
     - name: update-cbis
       image: $(params.BASE_IMAGE)

diff --git a/charts/pipelines-library/templates/tasks/update-cbis.yaml b/charts/pipelines-library/templates/tasks/update-cbis.yaml
@@ -16,7 +16,7 @@ spec:
     - name: BASE_IMAGE
       description: The base image for the task.
       type: string
-      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.2
+      default: {{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4
   steps:
     - name: update-cbis
       image: $(params.BASE_IMAGE)

diff --git a/hack/images/images.txt b/hack/images/images.txt
@@ -7,13 +7,8 @@ docker.io/alpine:3.18.9
 docker.io/amazon/aws-cli:2.7.35
 docker.io/antora/antora:3.1.4
 docker.io/aquasec/trivy:0.41.0
-docker.io/bitnami/git:2.41.0
-docker.io/bitnami/kubectl:1.25.2
 docker.io/bitnami/kubectl:1.25.4
-docker.io/curlimages/curl:7.70.0
-docker.io/curlimages/curl:7.85.0
 docker.io/epamedp/tekton-ansible:0.1.1
-docker.io/epamedp/tekton-autotest:0.1.3
 docker.io/epamedp/tekton-autotest:0.1.6
 docker.io/epamedp/tekton-cd-pipeline:0.1.2
 docker.io/epamedp/tekton-dotnet:6.0.2
@@ -25,20 +20,14 @@ docker.io/epamedp/tekton-tfenv:0.1.4
 docker.io/golang:1.22-bookworm
 docker.io/gradle:7.5.1-jdk11
 docker.io/gradle:7.5.1-jdk17
-docker.io/gradle:7.5.1-jdk8
 docker.io/hadolint/hadolint:v2.10.0-alpine
 docker.io/jnorwood/helm-docs:v1.13.1
 docker.io/library/node:18.20.3-alpine3.20
 docker.io/maven:3.9.0-eclipse-temurin-11
 docker.io/maven:3.9.0-eclipse-temurin-17
-docker.io/maven:3.9.0-eclipse-temurin-8
-docker.io/node:18.9.0
 docker.io/openpolicyagent/opa:0.45.0-debug
 docker.io/pipelinecomponents/ansible-lint:0.72.0
-docker.io/python:3.10.1-alpine3.15
 docker.io/python:3.10.8-alpine3.16
-docker.io/python:3.8-alpine3.16
 docker.io/python:3.8-slim
-docker.io/python:3.9.14-alpine3.16
 docker.io/returntocorp/semgrep:1.58.0
 docker.io/sonarsource/sonar-scanner-cli:5.0.1