Merge branch 'master' into dockerbake

jenkins-infra · Aug 23, 2023 · abe312b · abe312b
2 parents 00466b5 + 70a0bcb
commit abe312b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/vars/terraform.groovy b/vars/terraform.groovy
@@ -9,7 +9,7 @@ def call(userConfig = [:]) {
     stagingCredentials: [], // No custom secrets for staging by default
     productionCredentials: [], // No custom secrets for production by default
     productionBranch: 'main', // Defaults to the principal branch
-    agentContainerImage: 'jenkinsciinfra/hashicorp-tools:0.6.4', // Version managed by updatecli
+    agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.0', // Version managed by updatecli
     runTests: false, // Executes the tests provided by the "calling" project, which should provide a tests/Makefile
     runCommonTests: true, // Executes the default test suite from the shared tools repository (terratest)
   ]

diff --git a/vars/updatecli.groovy b/vars/updatecli.groovy
@@ -7,7 +7,7 @@ def call(userConfig = [:]) {
     action: 'diff', // Updatecli subcommand to execute
     config: './updatecli/updatecli.d', // Config manifest used by updatecli (can be a file or a directory)
     values: './updatecli/values.yaml', // Values file used by updatecli
-    updatecliDockerImage: 'jenkinsciinfra/helmfile:2.6.17', // Container image to use for running updatecli
+    updatecliDockerImage: 'jenkinsciinfra/helmfile:3.0.0', // Container image to use for running updatecli
     containerMemory: '512Mi', // When using 'updatecliDockerImage', this is the memory limit+request of the container
     cronTriggerExpression: '', // When specified, it enables cron trigger for the calling pipeline
     credentialsId: 'github-app-updatecli-on-jenkins-infra', // githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN

diff --git a/vars/updatecli.txt b/vars/updatecli.txt
@@ -8,7 +8,7 @@
       <li>String action: (Optional - Default: "diff") Updatecli action (e.g. subcommand) to execute.</li>
       <li>String config: (Optional - Default: "./updatecli/updatecli.d") path to the file or directory with the updatecli configuration (flag "--config").</li>
       <li>String values: (Optional - Default: "./updatecli/values.yaml") path to the file with the updatecli values (flag "--values").</li>
-      <li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:2.6.17") Docker Image of updatecli to be used in the process.</li>
+      <li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:3.0.0") Docker Image of updatecli to be used in the process.</li>
       <li>String cronTriggerExpression: (Optional - Default: "") Enable periodic execution by providing a cron-like expression.</li>
       <li>String containerMemory: (Optional - Default: "512Mi") specify the amount of memory dedicated to the updatecli container.</li>
       <li>String credentialsId: (Optional - Default: "github-app-updatecli-on-jenkins-infra") specify the githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN</li>