diff --git a/clusters/publick8s.yaml b/clusters/publick8s.yaml index 5bee24481..f8513b070 100644 --- a/clusters/publick8s.yaml +++ b/clusters/publick8s.yaml @@ -194,16 +194,6 @@ releases: - "../config/accountapp.yaml" secrets: - "../secrets/config/accountapp/secrets.yaml" - - name: mirrorbits - namespace: mirrorbits - chart: jenkins-infra/mirrorbits - version: 1.1.17 - timeout: 600 - atomic: false - values: - - "../config/mirrorbits.yaml" - secrets: - - "../secrets/config/mirrorbits/secrets.yaml" - name: get-jenkins-io namespace: get-jenkins-io chart: jenkins-infra/mirrorbits-parent diff --git a/config/get-jenkins-io.yaml b/config/get-jenkins-io.yaml index 553cb56b0..4a6d0aa12 100644 --- a/config/get-jenkins-io.yaml +++ b/config/get-jenkins-io.yaml @@ -7,38 +7,38 @@ global: "nginx.ingress.kubernetes.io/ssl-redirect": "true" "nginx.ingress.kubernetes.io/use-regex": "true" # Required to allow regexp path matching with Nginx hosts: - - host: azure.get.jenkins.io + - host: get.jenkins.io paths: - path: / backendService: httpd - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ # Requires the regexp engine of Nginx to be enabled pathType: ImplementationSpecific backendService: mirrorbits - # - host: mirrors.jenkins.io - # paths: - # - path: / - # backendService: httpd - # - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ # Requires the regexp engine of Nginx to be enabled - # pathType: ImplementationSpecific - # backendService: mirrorbits - # - host: mirrors.jenkins-ci.org - # paths: - # - path: / - # backendService: httpd - # - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ # Requires the regexp engine of Nginx to be enabled - # pathType: ImplementationSpecific - # backendService: mirrorbits - # - host: fallback.get.jenkins.io - # paths: - # - path: / - # backendService: httpd + - host: mirrors.jenkins.io + paths: + - path: / + backendService: httpd + - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ # Requires the regexp engine of Nginx to be enabled + pathType: ImplementationSpecific + backendService: mirrorbits + - host: mirrors.jenkins-ci.org + paths: + - path: / + backendService: httpd + - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ # Requires the regexp engine of Nginx to be enabled + pathType: ImplementationSpecific + backendService: mirrorbits + - host: fallback.get.jenkins.io + paths: + - path: / + backendService: httpd tls: - secretName: get-jenkins-io-tls hosts: - - azure.get.jenkins.io - # - mirrors.jenkins.io - # - mirrors.jenkins-ci.org - # - fallback.get.jenkins.io + - get.jenkins.io + - mirrors.jenkins.io + - mirrors.jenkins-ci.org + - fallback.get.jenkins.io storage: enabled: true claimNameTpl: '{{ include "mirrorbits-parent.pvc-name" $ }}' diff --git a/config/mirrorbits.yaml b/config/mirrorbits.yaml deleted file mode 100644 index 20bc51d42..000000000 --- a/config/mirrorbits.yaml +++ /dev/null @@ -1,119 +0,0 @@ -ingress: - enabled: true - className: public-nginx - annotations: - "cert-manager.io/cluster-issuer": "letsencrypt-prod" - "nginx.ingress.kubernetes.io/ssl-redirect": "true" - hosts: - - host: get.jenkins.io - paths: - - path: / - serviceNameSuffix: files - - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ - - host: mirrors.jenkins.io - paths: - - path: / - serviceNameSuffix: files - - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ - - host: mirrors.jenkins-ci.org - paths: - - path: / - serviceNameSuffix: files - - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$ - - host: fallback.get.jenkins.io - paths: - - path: / - serviceNameSuffix: files - tls: - - secretName: mirrorbits-tls - hosts: - - get.jenkins.io - - mirrors.jenkins.io - - mirrors.jenkins-ci.org - - fallback.get.jenkins.io - -resources: - mirrorbits: - limits: - cpu: 2 - memory: 2048Mi - requests: - cpu: 500m - memory: 500Mi - files: - limits: - cpu: 800m - memory: 2048Mi - requests: - cpu: 200m - memory: 500Mi - -repository: - name: mirrorbits-binary - persistentVolumeClaim: - enabled: true - spec: - accessModes: - - ReadWriteMany - storageClassName: azurefile-csi-premium - resources: - requests: - storage: 1000Gi - volumeName: mirrorbits-binary - persistentVolume: - enabled: true - spec: - capacity: - storage: 1000Gi - storageClassName: azurefile-csi-premium - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - csi: - driver: file.csi.azure.com - readOnly: false - volumeHandle: mirrorbits-binary # make sure this volumeid is unique for every identical share in the cluster - volumeAttributes: - resourceGroup: prod-core-releases - shareName: mirrorbits - nodeStageSecretRef: - name: mirrorbits-binary - namespace: mirrorbits - mountOptions: - - dir_mode=0755 - - file_mode=0644 - - uid=1000 - - gid=1000 - - mfsymlinks - - nobrl - - serverino - - cache=strict - -replicaCount: - mirrorbits: 2 - files: 2 - -nodeSelector: - kubernetes.io/arch: amd64 - -affinity: - mirrorbits: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: "app.kubernetes.io/name" - operator: In - values: - - mirrorbits - topologyKey: "kubernetes.io/hostname" - files: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: "app.kubernetes.io/name" - operator: In - values: - - mirrorbits-files - topologyKey: "kubernetes.io/hostname" diff --git a/updatecli/updatecli.d/charts/mirrorbits.yaml b/updatecli/updatecli.d/charts/mirrorbits.yaml deleted file mode 100644 index 5909fffdb..000000000 --- a/updatecli/updatecli.d/charts/mirrorbits.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: "Bump mirrorbits Helm Chart Version" - -scms: - default: - kind: github - spec: - user: "{{ .github.user }}" - email: "{{ .github.email }}" - owner: "{{ .github.owner }}" - repository: "{{ .github.repository }}" - token: "{{ requiredEnv .github.token }}" - username: "{{ .github.username }}" - branch: "{{ .github.branch }}" - -sources: - lastChartVersion: - kind: helmchart - name: get last chart version - spec: - url: https://jenkins-infra.github.io/helm-charts - name: mirrorbits - -targets: - updateChartVersion: - name: "Update the chart version for mirrorbits" - kind: file - spec: - file: clusters/publick8s.yaml - matchpattern: 'chart: jenkins-infra\/mirrorbits((\r\n|\r|\n)(\s+))version: .*' - replacepattern: 'chart: jenkins-infra/mirrorbits${1}version: {{ source "lastChartVersion" }}' - scmid: default - -actions: - default: - kind: github/pullrequest - scmid: default - title: Bump `mirrorbits` helm chart version to {{ source "lastChartVersion" }} - spec: - labels: - - dependencies - - mirrorbits