Merge branch 'main' into helpdesk-3530-matomo

jenkins-infra · Aug 14, 2023 · 3892012 · 3892012
2 parents 01f9df5 + da6720f
commit 3892012
Show file tree

Hide file tree

Showing 52 changed files with 406 additions and 310 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -12,7 +12,7 @@ creation_rules:
             - '88FABF5F307FB5870B6AD2E8A266F2D3F9D60C45' # Halkeye
             - '6699E555C6730CAED9083B7AD40F4AD2F55AF15F' # timja
             - '29B84443F41DE582F71599AFB47082DEE225AE06' # dduportal
-            - '516FC2C38E13860FA699B2CE2CA796B06D75307B' # hlemeur
+            - 'EE80BE3F340D4BD5A8F67794D63ECCA17D00EFE6' # hlemeur
             - 'E104B7543ECCCC68EA1EB35DD9B2DBFB59AD8344' # markewaite
             - '6CD774F428CA355770C67851496D2EDEDEFA7D47' # smerle
 
@@ -26,7 +26,7 @@ creation_rules:
             - '88FABF5F307FB5870B6AD2E8A266F2D3F9D60C45' # Halkeye
             - '6699E555C6730CAED9083B7AD40F4AD2F55AF15F' # timja
             - '29B84443F41DE582F71599AFB47082DEE225AE06' # dduportal
-            - '516FC2C38E13860FA699B2CE2CA796B06D75307B' # hlemeur
+            - 'EE80BE3F340D4BD5A8F67794D63ECCA17D00EFE6' # hlemeur
             - 'E104B7543ECCCC68EA1EB35DD9B2DBFB59AD8344' # markewaite
             - '6CD774F428CA355770C67851496D2EDEDEFA7D47' # smerle
 
@@ -40,7 +40,7 @@ creation_rules:
             - '88FABF5F307FB5870B6AD2E8A266F2D3F9D60C45' # Halkeye
             - '6699E555C6730CAED9083B7AD40F4AD2F55AF15F' # timja
             - '29B84443F41DE582F71599AFB47082DEE225AE06' # dduportal
-            - '516FC2C38E13860FA699B2CE2CA796B06D75307B' # hlemeur
+            - 'EE80BE3F340D4BD5A8F67794D63ECCA17D00EFE6' # hlemeur
             - 'E104B7543ECCCC68EA1EB35DD9B2DBFB59AD8344' # markewaite
             - '6CD774F428CA355770C67851496D2EDEDEFA7D47' # smerle
 
@@ -54,6 +54,6 @@ creation_rules:
             - '88FABF5F307FB5870B6AD2E8A266F2D3F9D60C45' # Halkeye
             - '6699E555C6730CAED9083B7AD40F4AD2F55AF15F' # timja
             - '29B84443F41DE582F71599AFB47082DEE225AE06' # dduportal
-            - '516FC2C38E13860FA699B2CE2CA796B06D75307B' # hlemeur
+            - 'EE80BE3F340D4BD5A8F67794D63ECCA17D00EFE6' # hlemeur
             - 'E104B7543ECCCC68EA1EB35DD9B2DBFB59AD8344' # markewaite
             - '6CD774F428CA355770C67851496D2EDEDEFA7D47' # smerle
diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
@@ -29,7 +29,7 @@ pipeline {
         axes {
           axis {
             name 'K8S_CLUSTER'
-            values 'cik8s', 'doks', 'doks-public', 'eks-public', 'privatek8s', 'prodpublick8s', 'publick8s'
+            values 'cik8s', 'doks', 'doks-public', 'eks-public', 'privatek8s', 'publick8s'
           }
         } // axes
         agent {
@@ -43,10 +43,6 @@ pipeline {
         AZURE_TENANT_ID           = credentials('sops-tenant-id')
         AZURE_CLIENT_ID           = credentials('sops-client-id')
         AZURE_CLIENT_SECRET       = credentials('sops-client-secret')
-        DIGITALOCEAN_ACCESS_TOKEN = credentials('production-terraform-digitalocean-pat')
-        // Required for AWS-hosted clusters.
-        // Variable name is constrained (ref. https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
-        AWS_SHARED_CREDENTIALS_FILE       =   credentials("${env.K8S_CLUSTER == 'eks-public' ? 'eks-public-charter-awsconfig': 'cik8s-charter-awsconfig'}")
       }
         stages {
           stage('Prepare Environment'){
@@ -55,7 +51,6 @@ pipeline {
               dir ('secrets'){
                 git branch: 'main', credentialsId: 'github-app-infra', url: 'https://github.com/jenkins-infra/charts-secrets.git'
               }
-              sh 'if (test "${K8S_CLUSTER}" = "doks" || test "${K8S_CLUSTER}" = "doks-public"); then doctl auth init > /dev/null; echo "INFO: command doctl auth init executed."; fi'
               sh 'kubectl cluster-info'
             }
           }
@@ -71,7 +66,7 @@ pipeline {
             steps {
               script {
                 def diff = sh(
-                  script:'helmfile --no-color -f "clusters/${K8S_CLUSTER}.yaml" diff --suppress-secrets --skip-deps --context=2 --concurrency=8',
+                  script:'helmfile -f "clusters/${K8S_CLUSTER}.yaml" diff --suppress-secrets --skip-deps --context=2 --concurrency=8',
                   returnStdout: true,
                 ).trim()
                 // Note the GitHub markdown formatting for the diff, to have syntax coloration

diff --git a/PodTemplates.yaml b/PodTemplates.yaml
@@ -26,7 +26,7 @@ spec:
       value: "spot"
       effect: "NoSchedule"
   containers:
-    - image: "jenkinsciinfra/helmfile:2.5.102"
+    - image: "jenkinsciinfra/helmfile:2.5.105"
       imagePullPolicy: "IfNotPresent"
       name: "jnlp"
       resources:

diff --git a/clusters/cik8s.yaml b/clusters/cik8s.yaml
@@ -32,7 +32,7 @@ releases:
       - default/docker-registry-secrets
     namespace: datadog
     chart: datadog/datadog
-    version: 3.30.10
+    version: 3.33.8
     values:
       - "../config/datadog.yaml.gotmpl"
       - "../config/datadog_cik8s.yaml"
@@ -67,7 +67,7 @@ releases:
   - name: autoscaler
     namespace: autoscaler
     chart: autoscaler/cluster-autoscaler
-    version: 9.28.0
+    version: 9.29.1
     values:
       - "../config/autoscaler_cik8s.yaml"
     set:

diff --git a/clusters/doks-public.yaml b/clusters/doks-public.yaml
@@ -30,7 +30,7 @@ releases:
   - name: cert-manager
     namespace: cert-manager
     chart: jetstack/cert-manager
-    version: v1.11.2
+    version: v1.12.3
     set:
       - name: installCRDs
         value: true
@@ -45,7 +45,7 @@ releases:
   - name: datadog
     namespace: datadog
     chart: datadog/datadog
-    version: 3.30.10
+    version: 3.33.8
     needs:
       - default/docker-registry-secrets
     values:
@@ -57,14 +57,14 @@ releases:
   - name: public-nginx-ingress
     namespace: public-nginx-ingress
     chart: ingress-nginx/ingress-nginx
-    version: 4.6.1
+    version: 4.7.1
     values:
       - "../config/public-nginx-ingress__common.yaml"
       - "../config/public-nginx-ingress_doks-public.yaml"
   - name: artifact-caching-proxy
     namespace: artifact-caching-proxy
     chart: jenkins-infra/artifact-caching-proxy
-    version: 0.10.4
+    version: 0.11.1
     needs:
       - public-nginx-ingress/public-nginx-ingress # Required to expose the proxy
     values:

diff --git a/clusters/doks.yaml b/clusters/doks.yaml
@@ -29,7 +29,7 @@ releases:
       - default/docker-registry-secrets
     namespace: datadog
     chart: datadog/datadog
-    version: 3.30.10
+    version: 3.33.8
     values:
       - "../config/datadog.yaml.gotmpl"
       - "../config/datadog_doks.yaml"

diff --git a/clusters/eks-public.yaml b/clusters/eks-public.yaml
@@ -37,7 +37,7 @@ releases:
   - name: autoscaler
     namespace: autoscaler
     chart: autoscaler/cluster-autoscaler
-    version: 9.28.0
+    version: 9.29.1
     values:
       - "../config/autoscaler_eks-public.yaml"
     set:
@@ -57,7 +57,7 @@ releases:
   - name: aws-load-balancer-controller
     namespace: aws-load-balancer
     chart: eks/aws-load-balancer-controller
-    version: 1.4.8
+    version: 1.6.0
     values:
       - "../config/aws-load-balancer-controller.yaml"
     set:
@@ -66,7 +66,7 @@ releases:
   - name: cert-manager
     namespace: cert-manager
     chart: jetstack/cert-manager
-    version: v1.11.2
+    version: v1.12.3
     set:
       - name: installCRDs
         value: true
@@ -81,7 +81,7 @@ releases:
   - name: datadog
     namespace: datadog
     chart: datadog/datadog
-    version: 3.30.10
+    version: 3.33.8
     values:
       - "../config/datadog.yaml.gotmpl"
       - "../config/datadog_eks-public.yaml"
@@ -90,14 +90,14 @@ releases:
   - name: public-nginx-ingress
     namespace: public-nginx-ingress
     chart: ingress-nginx/ingress-nginx
-    version: 4.6.1
+    version: 4.7.1
     values:
       - "../config/public-nginx-ingress__common.yaml"
       - "../config/public-nginx-ingress_eks-public.yaml"
   - name: artifact-caching-proxy
     namespace: artifact-caching-proxy
     chart: jenkins-infra/artifact-caching-proxy
-    version: 0.10.4
+    version: 0.11.1
     needs:
       - public-nginx-ingress/public-nginx-ingress # Required to expose the proxy
     values:

diff --git a/clusters/privatek8s.yaml b/clusters/privatek8s.yaml
@@ -36,14 +36,14 @@ releases:
   - name: cert-manager
     namespace: cert-manager
     chart: jetstack/cert-manager
-    version: v1.11.2
+    version: v1.12.3
     set:
       - name: installCRDs
         value: true
   - name: datadog
     namespace: datadog
     chart: datadog/datadog
-    version: 3.30.10
+    version: 3.33.8
     values:
       - "../config/datadog.yaml.gotmpl"
       - "../config/datadog_privatek8s.yaml"
@@ -52,7 +52,7 @@ releases:
   - name: jenkins-infra
     namespace: jenkins-infra
     chart: jenkins/jenkins
-    version: 4.3.24
+    version: 4.5.0
     timeout: 1200
     needs:
       - jenkins-infra-jobs # Required to generate the job definition in a configmap
@@ -79,7 +79,7 @@ releases:
   - name: jenkins-release
     namespace: jenkins-release
     chart: jenkins/jenkins
-    version: 4.3.24
+    version: 4.5.0
     timeout: 600
     needs:
       - public-nginx-ingress/public-nginx-ingress # Required to expose the webhooks endpoint (secondary ingress of the jenkins helm chart)
@@ -105,21 +105,21 @@ releases:
   - name: public-nginx-ingress
     namespace: public-nginx-ingress
     chart: ingress-nginx/ingress-nginx
-    version: 4.6.1
+    version: 4.7.1
     values:
       - "../config/public-nginx-ingress__common.yaml"
       - "../config/public-nginx-ingress_privatek8s.yaml"
   - name: private-nginx-ingress
     namespace: private-nginx-ingress
     chart: ingress-nginx/ingress-nginx
-    version: 4.6.1
+    version: 4.7.1
     values:
       - "../config/private-nginx-ingress__common.yaml"
       - "../config/private-nginx-ingress_privatek8s.yaml"
   - name: rss2twitter
     namespace: rss2twitter
     chart: jenkins-infra/rss2twitter
-    version: 0.0.3
+    version: 0.0.4
     values:
       - "../config/rss2twitter.yaml"
     secrets:
@@ -137,7 +137,7 @@ releases:
   - name: ircbot
     namespace: ircbot
     chart: jenkins-infra/ircbot
-    version: 0.2.8
+    version: 0.2.10
     values:
       - "../config/ircbot.yaml"
     secrets:

diff --git a/clusters/prodpublick8s.yaml b/clusters/prodpublick8s.yaml