diff --git a/clusters/publick8s.yaml b/clusters/publick8s.yaml index e8e0b6391..e22c29f39 100644 --- 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 deleted file mode 100644 index 4c645778e..000000000 --- a/config/artifact-caching-proxy_azure.yaml +++ /dev/null @@ -1,55 +0,0 @@ -ingress: - enabled: true - className: public-nginx - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-methods: "GET, OPTIONS" - nginx.ingress.kubernetes.io/cors-allow-origin: "*" - hosts: - - host: repo.azure.jenkins.io - paths: - - path: / - pathType: Prefix - tls: - - secretName: tls-secret - hosts: - - repo.azure.jenkins.io - -# TODO: link where PV and disk are defined (terraform Azure) -persistence: - enabled: true - size: 32 - storageClass: statically-provisionned - # Deterministic name - https://cloud.google.com/kubernetes-engine/docs/how-to/persistent-volumes/preexisting-pd#pv_to_statefulset - # to ensure the Terraform-managed PV can specify `claimRef`with the full generated name - claimPrefix: data - -nodeSelector: - kubernetes.io/arch: arm64 -tolerations: - - key: "kubernetes.io/arch" - operator: "Equal" - value: "arm64" - effect: "NoSchedule" - -resources: - limits: - cpu: 2 - memory: 4096Mi - requests: - cpu: 1 - memory: 2048Mi - -replicaCount: 2 -affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: "app.kubernetes.io/name" - operator: In - values: - - artifact-caching-proxy - topologyKey: "kubernetes.io/hostname" diff --git a/config/jenkins_infra.ci.jenkins.io.yaml b/config/jenkins_infra.ci.jenkins.io.yaml index 8689c998c..14789e5ef 100644 --- 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: | - - - - azure-proxy - https://repo.azure.jenkins.io/ - external:*,!chimera-releases,!chimera-snapshots,!atlassian-public,!org.zowe.sdk,!jitpack.io,!space-maven - - - - 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 index 21598d754..707188bee 100644 --- 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 index 1f777476c..b5dc6aa9e 100644 --- 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: