From 81350b1bf217d538d8f295eff8f2f02e104f0e82 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Mon, 20 May 2024 09:55:01 +0200 Subject: [PATCH] cleanup: remove management and leftovers of `cik8s`, `eks-public`, `doks` and `doks-public` (#5243) cleanup: remove management and leftovers of cik8s, eks-public, doks and doks-public as per https://github.com/jenkins-infra/helpdesk/issues/3954\#issuecomment-2119858778 Signed-off-by: Damien Duportal --- Jenkinsfile_k8s | 2 +- clusters/cik8s.yaml | 81 ------------- clusters/doks-public.yaml | 73 ------------ clusters/doks.yaml | 47 -------- clusters/eks-public.yaml | 106 ------------------ config/acme_doks-public.yaml | 16 --- config/acme_eks-public.yaml | 16 --- config/artifact-caching-proxy_aws.yaml | 26 ----- config/artifact-caching-proxy_do.yaml | 15 --- config/autoscaler_cik8s.yaml | 22 ---- config/autoscaler_eks-public.yaml | 22 ---- config/aws-load-balancer-controller.yaml | 9 -- .../aws-node-termination-handler_cik8s.yaml | 6 - ...s-node-termination-handler_eks-public.yaml | 6 - config/datadog_cik8s.yaml | 13 --- config/datadog_doks-public.yaml | 6 - config/datadog_doks.yaml | 6 - config/datadog_eks-public.yaml | 6 - config/jenkins-jobs_infra.ci.jenkins.io.yaml | 27 ----- ...rnetes-agents_ci.jenkins.io_cik8s-bom.yaml | 2 - ...gents_ci.jenkins.io_cik8s-experiments.yaml | 2 - ...kubernetes-agents_ci.jenkins.io_cik8s.yaml | 2 - ...-kubernetes-agents_ci.jenkins.io_doks.yaml | 2 - config/jenkins_infra.ci.jenkins.io.yaml | 67 ----------- config/public-nginx-ingress_doks-public.yaml | 5 - config/public-nginx-ingress_eks-public.yaml | 19 ---- updatecli/updatecli.d/charts/acme.yaml | 2 - .../charts/artifact-caching-proxy.yaml | 2 - updatecli/updatecli.d/charts/autoscaler.yaml | 43 ------- .../charts/aws-load-balancer-controller.yaml | 42 ------- .../charts/aws-node-termination-handler.yaml | 43 ------- .../updatecli.d/charts/cert-manager.yaml | 2 - updatecli/updatecli.d/charts/datadog.yaml | 4 - .../charts/jenkins-kubernetes-agent.yaml | 2 - .../charts/kubernetes-pods-quotas.yaml | 70 ------------ .../updatecli.d/charts/nginx-ingress.yaml | 2 - 36 files changed, 1 insertion(+), 815 deletions(-) delete mode 100644 clusters/cik8s.yaml delete mode 100644 clusters/doks-public.yaml delete mode 100644 clusters/doks.yaml delete mode 100644 clusters/eks-public.yaml delete mode 100644 config/acme_doks-public.yaml delete mode 100644 config/acme_eks-public.yaml delete mode 100644 config/artifact-caching-proxy_aws.yaml delete mode 100644 config/artifact-caching-proxy_do.yaml delete mode 100644 config/autoscaler_cik8s.yaml delete mode 100644 config/autoscaler_eks-public.yaml delete mode 100644 config/aws-load-balancer-controller.yaml delete mode 100644 config/aws-node-termination-handler_cik8s.yaml delete mode 100644 config/aws-node-termination-handler_eks-public.yaml delete mode 100644 config/datadog_cik8s.yaml delete mode 100644 config/datadog_doks-public.yaml delete mode 100644 config/datadog_doks.yaml delete mode 100644 config/datadog_eks-public.yaml delete mode 100644 config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml delete mode 100644 config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-experiments.yaml delete mode 100644 config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml delete mode 100644 config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml delete mode 100644 config/public-nginx-ingress_doks-public.yaml delete mode 100644 config/public-nginx-ingress_eks-public.yaml delete mode 100644 updatecli/updatecli.d/charts/autoscaler.yaml delete mode 100644 updatecli/updatecli.d/charts/aws-load-balancer-controller.yaml delete mode 100644 updatecli/updatecli.d/charts/aws-node-termination-handler.yaml delete mode 100644 updatecli/updatecli.d/charts/kubernetes-pods-quotas.yaml diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s index dda48a6d7..e1104432c 100644 --- a/Jenkinsfile_k8s +++ b/Jenkinsfile_k8s @@ -27,7 +27,7 @@ pipeline { axes { axis { name 'K8S_CLUSTER' - values 'cik8s', 'doks', 'doks-public', 'eks-public', 'privatek8s', 'publick8s', 'cijioagents1' + values 'privatek8s', 'publick8s', 'cijioagents1' } } // axes agent { diff --git a/clusters/cik8s.yaml b/clusters/cik8s.yaml deleted file mode 100644 index f1bc136e7..000000000 --- a/clusters/cik8s.yaml +++ /dev/null @@ -1,81 +0,0 @@ -helmDefaults: - atomic: true - force: false - timeout: 300 - wait: true -repositories: - # https://github.com/kubernetes/autoscaler/ - - name: autoscaler - url: https://kubernetes.github.io/autoscaler - # https://github.com/DataDog/helm-charts/ - - name: datadog - url: https://helm.datadoghq.com - # https://github.com/aws/eks-charts/ - - name: eks - url: https://aws.github.io/eks-charts - # https://github.com/jenkins-infra/helm-charts/ - - name: jenkins-infra - url: https://jenkins-infra.github.io/helm-charts -releases: - - name: docker-registry-secrets - # This helm chart doesn't create any resources within the namespace specified below. - # Specifying a namespace is required by the "needs" feature of helmfile (to allow referencing to this release from others) - namespace: default - chart: jenkins-infra/docker-registry-secrets - version: 0.1.0 - values: - - "../config/docker-registry-secrets.yaml" - secrets: - - "../secrets/config/docker-registry-secrets/secrets.yaml" - - name: datadog - needs: - - default/docker-registry-secrets - namespace: datadog - chart: datadog/datadog - version: 3.64.1 - values: - - "../config/datadog.yaml.gotmpl" - - "../config/datadog_cik8s.yaml" - secrets: - - "../secrets/config/datadog/cik8s-secrets.yaml" - - name: jenkins-agents - needs: - - default/docker-registry-secrets - namespace: jenkins-agents - chart: jenkins-infra/jenkins-kubernetes-agents - version: 1.0.0 - values: - - "../config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml" - secrets: - - "../secrets/config/jenkins-kubernetes-agents/secrets.yaml" - - name: jenkins-agents-bom - namespace: jenkins-agents-bom - chart: jenkins-infra/jenkins-kubernetes-agents - version: 1.0.0 - values: - - "../config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml" - secrets: - - "../secrets/config/jenkins-kubernetes-agents/secrets.yaml" - - name: jenkins-agents-experiments - namespace: jenkins-agents-experiments - chart: jenkins-infra/jenkins-kubernetes-agents - version: 1.0.0 - values: - - "../config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml" - secrets: - - "../secrets/config/jenkins-kubernetes-agents/secrets.yaml" - - name: autoscaler - namespace: autoscaler - chart: autoscaler/cluster-autoscaler - version: 9.37.0 - values: - - "../config/autoscaler_cik8s.yaml" - set: - - name: autoDiscovery.clusterName - value: cik8s-ENRZrfwf - - name: aws-node-termination-handler - namespace: eks - chart: eks/aws-node-termination-handler - version: 0.21.0 - values: - - "../config/aws-node-termination-handler_cik8s.yaml" diff --git a/clusters/doks-public.yaml b/clusters/doks-public.yaml deleted file mode 100644 index 82e7c10d3..000000000 --- a/clusters/doks-public.yaml +++ /dev/null @@ -1,73 +0,0 @@ -helmDefaults: - atomic: true - force: false - timeout: 300 - wait: true -repositories: - # https://github.com/DataDog/helm-charts/ - - name: datadog - url: https://helm.datadoghq.com - # https://github.com/kubernetes/ingress-nginx/ - - name: ingress-nginx - url: https://kubernetes.github.io/ingress-nginx - # https://github.com/jenkins-infra/helm-charts/ - - name: jenkins-infra - url: https://jenkins-infra.github.io/helm-charts - # https://github.com/cert-manager/cert-manager/ - - name: jetstack - url: https://charts.jetstack.io -releases: - - name: docker-registry-secrets - # This helm chart doesn't create any resources within the namespace specified below. - # Specifying a namespace is required by the "needs" feature of helmfile (to allow referencing to this release from others) - namespace: default - chart: jenkins-infra/docker-registry-secrets - version: 0.1.0 - values: - - "../config/docker-registry-secrets.yaml" - secrets: - - "../secrets/config/docker-registry-secrets/secrets.yaml" - - name: cert-manager - namespace: cert-manager - chart: jetstack/cert-manager - version: v1.14.5 - values: - - "../config/cert-manager.yaml" - - name: acme - namespace: cert-manager - chart: jenkins-infra/acme - version: 0.1.3 - needs: - - cert-manager - values: - - "../config/acme_doks-public.yaml" - - name: datadog - namespace: datadog - chart: datadog/datadog - version: 3.64.1 - needs: - - default/docker-registry-secrets - values: - - "../config/datadog.yaml.gotmpl" - - "../config/datadog_doks-public.yaml" - - "../config/datadog_confd_checksd.yaml" - secrets: - - "../secrets/config/datadog/doks-public-secrets.yaml" - - name: public-nginx-ingress - namespace: public-nginx-ingress - chart: ingress-nginx/ingress-nginx - version: 4.10.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: 1.1.2 - needs: - - public-nginx-ingress/public-nginx-ingress # Required to expose the proxy - values: - - "../config/artifact-caching-proxy__common.yaml" - - "../config/artifact-caching-proxy_do.yaml" - secrets: - - "../secrets/config/artifact-caching-proxy/secrets.yaml" diff --git a/clusters/doks.yaml b/clusters/doks.yaml deleted file mode 100644 index 3d77e1a1d..000000000 --- a/clusters/doks.yaml +++ /dev/null @@ -1,47 +0,0 @@ -helmDefaults: - atomic: true - force: false - timeout: 300 - wait: true -repositories: - # https://github.com/DataDog/helm-charts/ - - name: datadog - url: https://helm.datadoghq.com - # https://github.com/jenkins-infra/helm-charts/ - - name: jenkins-infra - url: https://jenkins-infra.github.io/helm-charts -releases: - - name: docker-registry-secrets - # This helm chart doesn't create any resources within the namespace specified below. - # Specifying a namespace is required by the "needs" feature of helmfile (to allow referencing to this release from others) - namespace: default - chart: jenkins-infra/docker-registry-secrets - version: 0.1.0 - values: - - "../config/docker-registry-secrets.yaml" - set: - - name: "imageCredentials.namespaces[1]" - value: jenkins-agents - secrets: - - "../secrets/config/docker-registry-secrets/secrets.yaml" - - name: datadog - needs: - - default/docker-registry-secrets - namespace: datadog - chart: datadog/datadog - version: 3.64.1 - values: - - "../config/datadog.yaml.gotmpl" - - "../config/datadog_doks.yaml" - secrets: - - "../secrets/config/datadog/doks-secrets.yaml" - - name: jenkins-agents - needs: - - default/docker-registry-secrets - namespace: jenkins-agents - chart: jenkins-infra/jenkins-kubernetes-agents - version: 1.0.0 - values: - - "../config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml" - secrets: - - "../secrets/config/jenkins-kubernetes-agents/secrets.yaml" diff --git a/clusters/eks-public.yaml b/clusters/eks-public.yaml deleted file mode 100644 index fb7f0c444..000000000 --- a/clusters/eks-public.yaml +++ /dev/null @@ -1,106 +0,0 @@ -helmDefaults: - atomic: true - force: false - timeout: 600 - wait: true -repositories: - # https://github.com/kubernetes/autoscaler/ - - name: autoscaler - url: https://kubernetes.github.io/autoscaler - # https://github.com/DataDog/helm-charts/ - - name: datadog - url: https://helm.datadoghq.com - # https://github.com/aws/eks-charts/ - - name: eks - url: https://aws.github.io/eks-charts - # https://github.com/kubernetes/ingress-nginx/ - - name: ingress-nginx - url: https://kubernetes.github.io/ingress-nginx - # https://github.com/jenkins-infra/helm-charts/ - - name: jenkins-infra - url: https://jenkins-infra.github.io/helm-charts - # https://github.com/cert-manager/cert-manager/ - - name: jetstack - url: https://charts.jetstack.io -releases: - - name: docker-registry-secrets - # This helm chart doesn't create any resources within the namespace specified below. - # Specifying a namespace is required by the "needs" feature of helmfile (to allow referencing to this release from others) - # NOTE: ensure a 'datadog' namespace exists before deploying a release of this chart to avoid errors - namespace: default - chart: jenkins-infra/docker-registry-secrets - version: 0.1.0 - values: - - "../config/docker-registry-secrets.yaml" - secrets: - - "../secrets/config/docker-registry-secrets/secrets.yaml" - - name: autoscaler - namespace: autoscaler - chart: autoscaler/cluster-autoscaler - version: 9.37.0 - values: - - "../config/autoscaler_eks-public.yaml" - set: - - name: autoDiscovery.clusterName - value: public-happy-polliwog - - name: aws-node-termination-handler - namespace: eks - chart: eks/aws-node-termination-handler - version: 0.21.0 - values: - - "../config/aws-node-termination-handler_eks-public.yaml" - # https://github.com/aws/eks-charts/tree/master/stable/aws-load-balancer-controller - # # If not using IAM Roles for service account - # helm install aws-load-balancer-controller eks/aws-load-balancer-controller --set clusterName= -n kube-system - # Prerequisite: install CRDs with - # kubectl apply -k "github.com/aws/eks-charts/stable/aws-load-balancer-controller//crds?ref=master" - - name: aws-load-balancer-controller - namespace: aws-load-balancer - chart: eks/aws-load-balancer-controller - version: 1.7.2 - values: - - "../config/aws-load-balancer-controller.yaml" - set: - - name: clusterName - value: public-happy-polliwog - - name: cert-manager - namespace: cert-manager - chart: jetstack/cert-manager - version: v1.14.5 - values: - - "../config/cert-manager.yaml" - - name: acme - namespace: cert-manager - chart: jenkins-infra/acme - version: 0.1.3 - needs: - - cert-manager - values: - - "../config/acme_eks-public.yaml" - - name: datadog - namespace: datadog - chart: datadog/datadog - version: 3.64.1 - values: - - "../config/datadog.yaml.gotmpl" - - "../config/datadog_eks-public.yaml" - secrets: - - "../secrets/config/datadog/eks-public-secrets.yaml" - - name: public-nginx-ingress - namespace: public-nginx-ingress - chart: ingress-nginx/ingress-nginx - version: 4.10.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: 1.1.2 - needs: - - public-nginx-ingress/public-nginx-ingress # Required to expose the proxy - values: - - "../config/artifact-caching-proxy__common.yaml" - - "../config/artifact-caching-proxy_aws.yaml" - secrets: - - "../secrets/config/artifact-caching-proxy/secrets.yaml" diff --git a/config/acme_doks-public.yaml b/config/acme_doks-public.yaml deleted file mode 100644 index 655264938..000000000 --- a/config/acme_doks-public.yaml +++ /dev/null @@ -1,16 +0,0 @@ -acme: - # The ACME server URL - server: https://acme-v02.api.letsencrypt.org/directory - # Email address used for ACME registration - email: jenkins-infra-team@googlegroups.com - # Name of a secret used to store the ACME account private key - privateKeySecretRef: - name: letsencrypt-prod - # Enable the HTTP-01 challenge provider - solvers: - - http01: - ingress: - class: nginx - clientSecrets: - - name: acme-secret-do-jenkins-io - value: password diff --git a/config/acme_eks-public.yaml b/config/acme_eks-public.yaml deleted file mode 100644 index 504148344..000000000 --- a/config/acme_eks-public.yaml +++ /dev/null @@ -1,16 +0,0 @@ -acme: - # The ACME server URL - server: https://acme-v02.api.letsencrypt.org/directory - # Email address used for ACME registration - email: jenkins-infra-team@googlegroups.com - # Name of a secret used to store the ACME account private key - privateKeySecretRef: - name: letsencrypt-prod - # Enable the HTTP-01 challenge provider - solvers: - - http01: - ingress: - serviceType: ClusterIP - clientSecrets: - - name: acme-secret-aws-jenkins-io - value: password diff --git a/config/artifact-caching-proxy_aws.yaml b/config/artifact-caching-proxy_aws.yaml deleted file mode 100644 index a54972b15..000000000 --- a/config/artifact-caching-proxy_aws.yaml +++ /dev/null @@ -1,26 +0,0 @@ -ingress: - annotations: - acme.cert-manager.io/http01-edit-in-place: "true" - hosts: - - host: repo.aws.jenkins.io - paths: - - path: / - pathType: Prefix - tls: - - secretName: tls-secret - hosts: - - repo.aws.jenkins.io - -persistence: - storageClass: ebs-sc-az1-retain - ## TODO: find a way to helmfile apply this YAML storageclass definition - ########## - # apiVersion: storage.k8s.io/v1 - # kind: StorageClass - # metadata: - # name: ebs-sc - # annotations: - # storageclass.kubernetes.io/is-default-class: "true" # Don't forget to edit the "gp2" to set this annotation to "false" - # provisioner: ebs.csi.aws.com - # volumeBindingMode: WaitForFirstConsumer - ########## diff --git a/config/artifact-caching-proxy_do.yaml b/config/artifact-caching-proxy_do.yaml deleted file mode 100644 index 4afb54af4..000000000 --- a/config/artifact-caching-proxy_do.yaml +++ /dev/null @@ -1,15 +0,0 @@ -ingress: - annotations: - acme.cert-manager.io/http01-edit-in-place: "true" - hosts: - - host: repo.do.jenkins.io - paths: - - path: / - pathType: Prefix - tls: - - secretName: tls-secret - hosts: - - repo.do.jenkins.io - -persistence: - storageClass: do-block-storage diff --git a/config/autoscaler_cik8s.yaml b/config/autoscaler_cik8s.yaml deleted file mode 100644 index 607f29241..000000000 --- a/config/autoscaler_cik8s.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -awsRegion: us-east-2 - -nodeSelector: - eks.amazonaws.com/capacityType: ON_DEMAND - node.kubernetes.io/instance-type: t3a.xlarge - -extraArgs: - balance-similar-node-groups: true -replicaCount: 2 - -rbac: - create: true - serviceAccount: - # This value is defined in https://github.com/jenkins-infra/aws/blob/905a94ade784122cf7a7aa3c798576a820c5600f/locals.tf#L10 - name: cluster-autoscaler-aws-cluster-autoscaler-chart - annotations: - # This value should match the ARN of the role created by module.iam_assumable_role_admin - eks.amazonaws.com/role-arn: "arn:aws:iam::200564066411:role/cluster-autoscaler-aws-cluster-autoscaler-chart-cik8s" - -autoDiscovery: - enabled: true diff --git a/config/autoscaler_eks-public.yaml b/config/autoscaler_eks-public.yaml deleted file mode 100644 index c2f54d04f..000000000 --- a/config/autoscaler_eks-public.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -awsRegion: us-east-2 - -nodeSelector: - eks.amazonaws.com/capacityType: ON_DEMAND - node.kubernetes.io/instance-type: t3a.xlarge - -extraArgs: - balance-similar-node-groups: true -replicaCount: 2 - -rbac: - create: true - serviceAccount: - # This value is defined in https://github.com/jenkins-infra/aws/blob/905a94ade784122cf7a7aa3c798576a820c5600f/locals.tf#L10 - name: cluster-autoscaler-aws-cluster-autoscaler-chart - annotations: - # This value should match the ARN of the role created by module.iam_assumable_role_admin - eks.amazonaws.com/role-arn: "arn:aws:iam::200564066411:role/cluster-autoscaler-aws-cluster-autoscaler-chart-eks-public" - -autoDiscovery: - enabled: true diff --git a/config/aws-load-balancer-controller.yaml b/config/aws-load-balancer-controller.yaml deleted file mode 100644 index 1c5ad2854..000000000 --- a/config/aws-load-balancer-controller.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# https://github.com/jenkins-infra/aws/blob/e17045dab632d8e939f16ca7ade65ecf65ac4118/eks-public-cluster.tf#L11 -serviceAccount: - create: true - name: aws-load-balancer-controller - annotations: - # This value should match the ARN of the role created by module.iam_assumable_role_admin in iam-role-nlb.tf - eks.amazonaws.com/role-arn: "arn:aws:iam::200564066411:role/aws-load-balancer-controller-eks-public" -# In order to avoid a ALB as we use Nginx for ingress -createIngressClassResource: false diff --git a/config/aws-node-termination-handler_cik8s.yaml b/config/aws-node-termination-handler_cik8s.yaml deleted file mode 100644 index 867539cc4..000000000 --- a/config/aws-node-termination-handler_cik8s.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -awsRegion: us-east-2 - -nodeSelector: - node.kubernetes.io/lifecycle: normal - node.kubernetes.io/instance-type: t3a.xlarge diff --git a/config/aws-node-termination-handler_eks-public.yaml b/config/aws-node-termination-handler_eks-public.yaml deleted file mode 100644 index 867539cc4..000000000 --- a/config/aws-node-termination-handler_eks-public.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -awsRegion: us-east-2 - -nodeSelector: - node.kubernetes.io/lifecycle: normal - node.kubernetes.io/instance-type: t3a.xlarge diff --git a/config/datadog_cik8s.yaml b/config/datadog_cik8s.yaml deleted file mode 100644 index 7b4331bda..000000000 --- a/config/datadog_cik8s.yaml +++ /dev/null @@ -1,13 +0,0 @@ -datadog: - clusterName: 'cik8s' -clusterAgent: - image: - pullSecrets: - - name: "dockerhub-credential" -agents: - tolerations: - # These tolerations are needed to run the agents on the bom node pool - - key: "ci.jenkins.io/bom" - operator: "Equal" - value: "true" - effect: "NoSchedule" diff --git a/config/datadog_doks-public.yaml b/config/datadog_doks-public.yaml deleted file mode 100644 index 844b6b498..000000000 --- a/config/datadog_doks-public.yaml +++ /dev/null @@ -1,6 +0,0 @@ -datadog: - clusterName: 'doks-public' -clusterAgent: - image: - pullSecrets: - - name: "dockerhub-credential" diff --git a/config/datadog_doks.yaml b/config/datadog_doks.yaml deleted file mode 100644 index cd056a4c1..000000000 --- a/config/datadog_doks.yaml +++ /dev/null @@ -1,6 +0,0 @@ -datadog: - clusterName: 'doks' -clusterAgent: - image: - pullSecrets: - - name: "dockerhub-credential" diff --git a/config/datadog_eks-public.yaml b/config/datadog_eks-public.yaml deleted file mode 100644 index 15f1c8043..000000000 --- a/config/datadog_eks-public.yaml +++ /dev/null @@ -1,6 +0,0 @@ -datadog: - clusterName: 'eks-public' -clusterAgent: - image: - pullSecrets: - - name: "dockerhub-credential" diff --git a/config/jenkins-jobs_infra.ci.jenkins.io.yaml b/config/jenkins-jobs_infra.ci.jenkins.io.yaml index 7db93f4f8..e07f551ea 100644 --- a/config/jenkins-jobs_infra.ci.jenkins.io.yaml +++ b/config/jenkins-jobs_infra.ci.jenkins.io.yaml @@ -63,12 +63,6 @@ jobsDefinition: packer-images: name: Packer Images credentials: - packer-aws-access-key-id: &packer-aws-access-key-id-def - description: AWS API key for the account ci-packer - secret: "${CI_PACKER_AWS_ACCESS_KEY_ID}" - packer-aws-secret-access-key: &packer-aws-secret-access-key-def - description: AWS Secret key for the account ci-packer - secret: "${CI_PACKER_AWS_SECRET_ACCESS_KEY}" packer-azure-serviceprincipal: azureEnvironmentName: "Azure" clientId: "${PACKER_AZURE_CLIENT_ID}" @@ -108,22 +102,6 @@ jobsDefinition: sops-tenant-id: secret: "${SOPS_TENANT_ID}" description: Azure tenant id used by sops to decrypt secrets - kubeconfig-cik8s: - fileName: "kubeconfig" - description: "Kubeconfig file for cik8s" - secretBytes: "${base64:${KUBECONFIG_CIK8S}}" - kubeconfig-eks-public: - fileName: "kubeconfig" - description: "Kubeconfig file for eks-public" - secretBytes: "${base64:${KUBECONFIG_EKS_PUBLIC}}" - kubeconfig-doks: - fileName: "kubeconfig" - description: "Kubeconfig file for doks" - secretBytes: "${base64:${KUBECONFIG_DOKS}}" - kubeconfig-doks-public: - fileName: "kubeconfig" - description: "Kubeconfig file for doks-public" - secretBytes: "${base64:${KUBECONFIG_DOKS_PUBLIC}}" kubeconfig-privatek8s: fileName: "kubeconfig" description: "Kubeconfig file for privatek8s" @@ -139,11 +117,6 @@ jobsDefinition: updatecli: name: Dependencies Management with Updatecli kind: folder - credentials: - # Used by updatecli to retrieve AMIs - packer-aws-access-key-id: *packer-aws-access-key-id-def - # Used by updatecli to retrieve AMIs - packer-aws-secret-access-key: *packer-aws-secret-access-key-def children: jenkins-infra: name: Puppet (jenkins-infra) diff --git a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml b/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml deleted file mode 100644 index fff74429d..000000000 --- a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml +++ /dev/null @@ -1,2 +0,0 @@ -quotas: - pods: 150 diff --git a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-experiments.yaml b/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-experiments.yaml deleted file mode 100644 index 46f7b7137..000000000 --- a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-experiments.yaml +++ /dev/null @@ -1,2 +0,0 @@ -quotas: - pods: 345 diff --git a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml b/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml deleted file mode 100644 index fff74429d..000000000 --- a/config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml +++ /dev/null @@ -1,2 +0,0 @@ -quotas: - pods: 150 diff --git a/config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml b/config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml deleted file mode 100644 index acf604f57..000000000 --- a/config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml +++ /dev/null @@ -1,2 +0,0 @@ -quotas: - pods: 48 diff --git a/config/jenkins_infra.ci.jenkins.io.yaml b/config/jenkins_infra.ci.jenkins.io.yaml index c71af9449..771d13a2c 100644 --- a/config/jenkins_infra.ci.jenkins.io.yaml +++ b/config/jenkins_infra.ci.jenkins.io.yaml @@ -540,52 +540,6 @@ controller: unclassified: globalConfigFiles: configs: - - mavenSettings: - comment: "Artifact caching proxy settings for the AWS provider" - content: | - - - - aws-proxy - https://repo.aws.jenkins.io/ - external:*,!chimera-releases,!chimera-snapshots,!atlassian-public,!org.zowe.sdk,!jitpack.io,!space-maven - - - - - jenkins-infra-plugin-repositories - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - - false - - incrementals - https://repo.jenkins-ci.org/incrementals/ - - - central - https://repo.maven.apache.org/maven2 - - - - - - jenkins-infra-plugin-repositories - - - id: "artifact-caching-proxy-aws" - isReplaceAll: true - name: "AWS Artifact Caching Proxy" - providerId: "org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig" - serverCredentialMappings: - - credentialsId: "artifact-caching-proxy-credentials" - serverId: "aws-proxy" - - credentialsId: "artifact-caching-proxy-credentials" - serverId: "aws-proxy-incrementals" - mavenSettings: comment: "Artifact caching proxy settings for the Azure provider" content: | @@ -607,27 +561,6 @@ controller: serverId: "azure-proxy" - credentialsId: "artifact-caching-proxy-credentials" serverId: "azure-proxy-incrementals" - - mavenSettings: - comment: "Artifact caching proxy settings for the DigitalOcean provider" - content: | - - - - do-proxy - https://repo.do.jenkins.io/ - external:*,!chimera-releases,!chimera-snapshots,!atlassian-public,!org.zowe.sdk,!jitpack.io,!space-maven - - - - id: "artifact-caching-proxy-do" - isReplaceAll: true - name: "DigitalOcean Artifact Caching Proxy" - providerId: "org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig" - serverCredentialMappings: - - credentialsId: "artifact-caching-proxy-credentials" - serverId: "do-proxy" - - credentialsId: "artifact-caching-proxy-credentials" - serverId: "do-proxy-incrementals" matrix-settings: | jenkins: authorizationStrategy: diff --git a/config/public-nginx-ingress_doks-public.yaml b/config/public-nginx-ingress_doks-public.yaml deleted file mode 100644 index 39f077bf2..000000000 --- a/config/public-nginx-ingress_doks-public.yaml +++ /dev/null @@ -1,5 +0,0 @@ -controller: - ingressClassResource: - default: true - ingressClassByName: true - ingressClass: public-nginx diff --git a/config/public-nginx-ingress_eks-public.yaml b/config/public-nginx-ingress_eks-public.yaml deleted file mode 100644 index 52063cfb7..000000000 --- a/config/public-nginx-ingress_eks-public.yaml +++ /dev/null @@ -1,19 +0,0 @@ -controller: - service: - annotations: - # NLB is balancing at Layer 4 (no need for an ALB-layer 7) - # Using `nlb-ip` instead of `nlb` ensures the AWS LoadBalancer Controller is used to provision (instead of the Legacy Cloud Controller) - # as per https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.4/guide/service/annotations/#legacy-cloud-provider - service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip - service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing" - # Using "ip" instead of instance ensures that balancing is NOT handled - # by the cluster iptables, but by the external LB itself through CNI - service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip - # https://github.com/jenkins-infra/aws/blob/main/vpc.tf - service.beta.kubernetes.io/aws-load-balancer-subnets: subnet-03f3f5c43b4e312df, subnet-0439f1b3505a86064, subnet-08d5d75484ad0b7c1 - # Defined in https://github.com/jenkins-infra/aws/blob/main/eks-public-cluster.tf - service.beta.kubernetes.io/aws-load-balancer-eip-allocations: eipalloc-03bcda5de8989b2a7, eipalloc-02112eaece33364b5, eipalloc-040e011509996d859 - ingressClassResource: - default: true - ingressClassByName: true - ingressClass: public-nginx diff --git a/updatecli/updatecli.d/charts/acme.yaml b/updatecli/updatecli.d/charts/acme.yaml index ec212873e..ba7e5867a 100644 --- a/updatecli/updatecli.d/charts/acme.yaml +++ b/updatecli/updatecli.d/charts/acme.yaml @@ -26,8 +26,6 @@ targets: kind: file spec: files: - - clusters/doks-public.yaml - - clusters/eks-public.yaml - clusters/privatek8s.yaml - clusters/publick8s.yaml matchpattern: 'chart: jenkins-infra\/acme((\r\n|\r|\n)(\s+))version: .*' diff --git a/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml b/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml index b51181340..1f777476c 100644 --- a/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml +++ b/updatecli/updatecli.d/charts/artifact-caching-proxy.yaml @@ -27,8 +27,6 @@ targets: scmid: default spec: files: - - clusters/doks-public.yaml - - clusters/eks-public.yaml - clusters/publick8s.yaml - clusters/cijioagents1.yaml matchpattern: 'chart: jenkins-infra\/artifact-caching-proxy((\r\n|\r|\n)(\s+))version: .*' diff --git a/updatecli/updatecli.d/charts/autoscaler.yaml b/updatecli/updatecli.d/charts/autoscaler.yaml deleted file mode 100644 index 5ac796f4c..000000000 --- a/updatecli/updatecli.d/charts/autoscaler.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: Bump autoscaler 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://kubernetes.github.io/autoscaler - name: cluster-autoscaler - -targets: - updateChartVersion: - name: "autoscaler/cluster-autoscaler Helm Chart" - kind: file - scmid: default - spec: - files: - - clusters/cik8s.yaml - - clusters/eks-public.yaml - matchpattern: 'chart: autoscaler\/cluster-autoscaler((\r\n|\r|\n)(\s+))version: .*' - replacepattern: 'chart: autoscaler/cluster-autoscaler${1}version: {{ source "lastChartVersion" }}' - -actions: - default: - kind: github/pullrequest - scmid: default - title: Bump `autoscaler` helm chart version to {{ source "lastChartVersion" }} - spec: - labels: - - dependencies - - autoscaler diff --git a/updatecli/updatecli.d/charts/aws-load-balancer-controller.yaml b/updatecli/updatecli.d/charts/aws-load-balancer-controller.yaml deleted file mode 100644 index 3a2dbd8a9..000000000 --- a/updatecli/updatecli.d/charts/aws-load-balancer-controller.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: Bump aws-load-balancer-controller 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: - name: get last chart version - kind: helmchart - spec: - url: https://aws.github.io/eks-charts - name: aws-load-balancer-controller - -targets: - updateChartVersion: - name: "eks/aws-load-balancer-controller Helm Chart" - kind: file - scmid: default - spec: - files: - - clusters/eks-public.yaml - matchpattern: 'chart: eks\/aws-load-balancer-controller((\r\n|\r|\n)(\s+))version: .*' - replacepattern: 'chart: eks/aws-load-balancer-controller${1}version: {{ source "lastChartVersion" }}' - -actions: - default: - kind: github/pullrequest - scmid: default - title: Bump `aws-load-balancer-controller` helm chart version to {{ source "lastChartVersion" }} - spec: - labels: - - dependencies - - aws-load-balancer-controller diff --git a/updatecli/updatecli.d/charts/aws-node-termination-handler.yaml b/updatecli/updatecli.d/charts/aws-node-termination-handler.yaml deleted file mode 100644 index c490be4a4..000000000 --- a/updatecli/updatecli.d/charts/aws-node-termination-handler.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: Bump aws-node-termination-handler 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://aws.github.io/eks-charts - name: aws-node-termination-handler - -targets: - updateChartVersion: - name: "eks/aws-node-termination-handler Helm Chart" - kind: file - scmid: default - spec: - files: - - clusters/cik8s.yaml - - clusters/eks-public.yaml - matchpattern: 'chart: eks\/aws-node-termination-handler((\r\n|\r|\n)(\s+))version: .*' - replacepattern: 'chart: eks/aws-node-termination-handler${1}version: {{ source "lastChartVersion" }}' - -actions: - default: - kind: github/pullrequest - scmid: default - title: Bump `aws-node-termination-handler` helm chart version to {{ source "lastChartVersion" }} - spec: - labels: - - dependencies - - aws-node-termination-handler diff --git a/updatecli/updatecli.d/charts/cert-manager.yaml b/updatecli/updatecli.d/charts/cert-manager.yaml index 34de89d85..e6de58e17 100644 --- a/updatecli/updatecli.d/charts/cert-manager.yaml +++ b/updatecli/updatecli.d/charts/cert-manager.yaml @@ -26,8 +26,6 @@ targets: kind: file spec: files: - - clusters/doks-public.yaml - - clusters/eks-public.yaml - clusters/privatek8s.yaml - clusters/publick8s.yaml matchpattern: 'chart: jetstack\/cert-manager((\r\n|\r|\n)(\s+))version: .*' diff --git a/updatecli/updatecli.d/charts/datadog.yaml b/updatecli/updatecli.d/charts/datadog.yaml index 1b00f1174..b5181da49 100644 --- a/updatecli/updatecli.d/charts/datadog.yaml +++ b/updatecli/updatecli.d/charts/datadog.yaml @@ -27,10 +27,6 @@ targets: scmid: default spec: files: - - clusters/cik8s.yaml - - clusters/doks.yaml - - clusters/doks-public.yaml - - clusters/eks-public.yaml - clusters/privatek8s.yaml - clusters/publick8s.yaml matchpattern: 'chart: datadog\/datadog((\r\n|\r|\n)(\s+))version: .*' diff --git a/updatecli/updatecli.d/charts/jenkins-kubernetes-agent.yaml b/updatecli/updatecli.d/charts/jenkins-kubernetes-agent.yaml index 8ed035201..d9d406c64 100644 --- a/updatecli/updatecli.d/charts/jenkins-kubernetes-agent.yaml +++ b/updatecli/updatecli.d/charts/jenkins-kubernetes-agent.yaml @@ -26,8 +26,6 @@ targets: kind: file spec: files: - - clusters/cik8s.yaml - - clusters/doks.yaml - clusters/privatek8s.yaml matchpattern: 'chart: jenkins-infra\/jenkins-kubernetes-agents((\r\n|\r|\n)(\s+))version: .*' replacepattern: 'chart: jenkins-infra/jenkins-kubernetes-agents${1}version: {{ source "lastChartVersion" }}' diff --git a/updatecli/updatecli.d/charts/kubernetes-pods-quotas.yaml b/updatecli/updatecli.d/charts/kubernetes-pods-quotas.yaml deleted file mode 100644 index 5687f861e..000000000 --- a/updatecli/updatecli.d/charts/kubernetes-pods-quotas.yaml +++ /dev/null @@ -1,70 +0,0 @@ -name: Update pods quotas on the clusters used by ci.jenkins.io - -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: - cik8s_maxcapacity: - kind: yaml - name: get pods number for cik8s in ci.jenkins.io, namespace 'jenkins-agents' - spec: - file: "https://raw.githubusercontent.com/jenkins-infra/jenkins-infra/production/hieradata/clients/controller.sponsorship.ci.jenkins.io.yaml" - key: "profile::jenkinscontroller::jcasc.cloud_agents.kubernetes.cik8s.max_capacity" - cik8s_bom_maxcapacity: - kind: yaml - name: get pods number for cik8s in ci.jenkins.io, namespace 'jenkins-agents-bom' - spec: - file: "https://raw.githubusercontent.com/jenkins-infra/jenkins-infra/production/hieradata/clients/controller.sponsorship.ci.jenkins.io.yaml" - key: "profile::jenkinscontroller::jcasc.cloud_agents.kubernetes.cik8s-bom.max_capacity" - doks_maxcapacity: - kind: yaml - name: get pods number for doks in ci.jenkins.io - spec: - file: "https://raw.githubusercontent.com/jenkins-infra/jenkins-infra/production/hieradata/clients/controller.sponsorship.ci.jenkins.io.yaml" - key: "profile::jenkinscontroller::jcasc.cloud_agents.kubernetes.doks.max_capacity" - -targets: - quotas_cik8s_maxcapacity: - name: "Update the pods quotas in kubernetes for cik8s" - kind: yaml - sourceid: cik8s_maxcapacity - spec: - file: config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s.yaml - key: '$.quotas.pods' - scmid: default - quotas_cik8s_bom_maxcapacity: - name: "Update the pods quotas in kubernetes for cik8s-bom" - kind: yaml - sourceid: cik8s_bom_maxcapacity - spec: - file: config/jenkins-kubernetes-agents_ci.jenkins.io_cik8s-bom.yaml - key: '$.quotas.pods' - scmid: default - quotas_doks_maxcapacity: - name: "Update the pods quotas in kubernetes for doks" - kind: yaml - sourceid: doks_maxcapacity - spec: - file: config/jenkins-kubernetes-agents_ci.jenkins.io_doks.yaml - key: '$.quotas.pods' - scmid: default - -actions: - default: - kind: github/pullrequest - scmid: default - title: Update `quotas.pods` within `cik8s` cluster to {{ source "cik8s_maxcapacity" }}, `cik8s` cluster (`bom` node pool) to {{ source "cik8s_bom_maxcapacity" }} and/or `doks` cluster to {{ source "doks_maxcapacity" }} - spec: - labels: - - dependencies - - jenkins-kubernetes-agents - - quotas.pods diff --git a/updatecli/updatecli.d/charts/nginx-ingress.yaml b/updatecli/updatecli.d/charts/nginx-ingress.yaml index f41dea3a5..43ff0cb98 100644 --- a/updatecli/updatecli.d/charts/nginx-ingress.yaml +++ b/updatecli/updatecli.d/charts/nginx-ingress.yaml @@ -26,8 +26,6 @@ targets: kind: file spec: files: - - clusters/doks-public.yaml - - clusters/eks-public.yaml - clusters/privatek8s.yaml - clusters/publick8s.yaml matchpattern: 'chart: ingress-nginx\/ingress-nginx((\r\n|\r|\n)(\s+))version: .*'