cleanup(publick8s/privatek8s) remove leftovers of the public ACP inst…

…ance (#5566) Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Aug 17, 2024 · 5326da8 · 5326da8
1 parent dc604c7
commit 5326da8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 121 deletions.
diff --git a/clusters/publick8s.yaml b/clusters/publick8s.yaml
@@ -73,16 +73,6 @@ releases:
     version: 4.7.2
     values:
       - "../config/falco.yaml"
-  - name: artifact-caching-proxy
-    namespace: artifact-caching-proxy
-    chart: jenkins-infra/artifact-caching-proxy
-    version: 1.6.1
-    needs:
-      - public-nginx-ingress/public-nginx-ingress # Required to expose the proxy
-    values:
-      - "../config/artifact-caching-proxy_azure.yaml"
-    secrets:
-      - "../secrets/config/artifact-caching-proxy/secrets.yaml"
   - name: jenkins-weekly
     namespace: jenkins-weekly
     chart: jenkins/jenkins

diff --git a/config/artifact-caching-proxy_azure.yaml b/config/artifact-caching-proxy_azure.yaml
diff --git a/config/jenkins_infra.ci.jenkins.io.yaml b/config/jenkins_infra.ci.jenkins.io.yaml
@@ -84,12 +84,6 @@ controller:
                     privateKey: "${GITHUB_APP_JENKINS_INFRA_UPDATECLI_PRIVATE_KEY}"
                     owner: "jenkins-infra"
                     scope: GLOBAL
-                - usernamePassword:
-                    description: "Credentials to access an artifact caching proxy"
-                    id: "artifact-caching-proxy-credentials"
-                    password: "${ARTIFACT_CACHING_PROXY_PASSWORD}"
-                    scope: GLOBAL
-                    username: "MY-USERNAME"
                 - azure:
                     azureEnvironmentName: "Azure"
                     clientId: "${JENKINSINFRA_AZURE_CLIENT_ID}"
@@ -143,9 +137,6 @@ controller:
                         - envVar:
                             key: "JAVA_HOME"
                             value: "/opt/jdk-17"
-                        - envVar:
-                            key: "ARTIFACT_CACHING_PROXY_PROVIDER"
-                            value: "azure"
                         resourceLimitMemory: "2048Mi"
                         resourceRequestCpu: "500m"
                         resourceRequestMemory: "512Mi"
@@ -179,9 +170,6 @@ controller:
                         - envVar:
                             key: "JAVA_HOME"
                             value: "/opt/jdk-17"
-                        - envVar:
-                            key: "ARTIFACT_CACHING_PROXY_PROVIDER"
-                            value: "azure"
                         resourceLimitMemory: "2048Mi"
                         resourceRequestCpu: "500m"
                         resourceRequestMemory: "512Mi"
@@ -225,9 +213,6 @@ controller:
                         - envVar:
                             key: "PATH"
                             value: "~/.asdf/shims:~/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin"
-                        - envVar:
-                            key: "ARTIFACT_CACHING_PROXY_PROVIDER"
-                            value: "azure"
                         resourceLimitMemory: "8G"
                         resourceRequestCpu: "500m"
                         resourceRequestMemory: "1G"
@@ -670,31 +655,6 @@ controller:
                     git:
                       credentialsId: "github-app-infra"
                       remote: "https://github.com/jenkins-infra/pipeline-library.git"
-      artifact-caching-proxy: |
-        unclassified:
-          globalConfigFiles:
-            configs:
-            - mavenSettings:
-                comment: "Artifact caching proxy settings for the Azure provider"
-                content: |
-                  <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-                    <mirrors>
-                      <mirror>
-                          <id>azure-proxy</id>
-                          <url>https://repo.azure.jenkins.io/</url>
-                          <mirrorOf>external:*,!chimera-releases,!chimera-snapshots,!atlassian-public,!org.zowe.sdk,!jitpack.io,!space-maven</mirrorOf>
-                      </mirror>
-                    </mirrors>
-                  </settings>
-                id: "artifact-caching-proxy-azure"
-                isReplaceAll: true
-                name: "Azure Artifact Caching Proxy"
-                providerId: "org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig"
-                serverCredentialMappings:
-                - credentialsId: "artifact-caching-proxy-credentials"
-                  serverId: "azure-proxy"
-                - credentialsId: "artifact-caching-proxy-credentials"
-                  serverId: "azure-proxy-incrementals"
       matrix-settings: |
         jenkins:
           authorizationStrategy:

diff --git a/updatecli/updatecli.d/acp-lb.yaml b/updatecli/updatecli.d/acp-lb.yaml
@@ -32,13 +32,13 @@ targets:
     spec:
       file: config/artifact-caching-proxy_azure-aks.yaml
       key: $.service.annotations.'service.beta.kubernetes.io/azure-load-balancer-ipv4'
-#     scmid: default
+    scmid: default
 
-# actions:
-#   default:
-#     kind: github/pullrequest
-#     scmid: default
-#     title: Update Artifact Caching Proxy internal LB IPv4
-#     spec:
-#       labels:
-#         - artifact-caching-proxy
+actions:
+  default:
+    kind: github/pullrequest
+    scmid: default
+    title: Update Artifact Caching Proxy internal LB IPv4
+    spec:
+      labels:
+        - artifact-caching-proxy
diff --git a/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml b/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml
@@ -23,14 +23,12 @@ sources:
 targets:
   updateChartVersion:
     name: "Update the chart version for artifact-caching-proxy"
-    kind: file
-    scmid: default
+    kind: yaml
     spec:
-      files:
-        - clusters/publick8s.yaml
-        - clusters/cijioagents1.yaml
-      matchpattern: 'chart: jenkins-infra\/artifact-caching-proxy((\r\n|\r|\n)(\s+))version: .*'
-      replacepattern: 'chart: jenkins-infra/artifact-caching-proxy${1}version: {{ source "lastChartVersion" }}'
+      file: clusters/cijioagents1.yaml
+      engine: yamlpath
+      key: $.releases[?(@.name == 'artifact-caching-proxy')].version
+    scmid: default
 
 actions:
   default: