Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(infra.ci): add the new cluster as kubernetes cloud #5327

Merge branch 'main' into infraci/add/cloud/kube/infracijenkinsioagent1

1b20d11
Select commit
Loading
Failed to load commit list.
Merged

feat(infra.ci): add the new cluster as kubernetes cloud #5327

Merge branch 'main' into infraci/add/cloud/kube/infracijenkinsioagent1
1b20d11
Select commit
Loading
Failed to load commit list.
infra.ci.jenkins.io / helmfile-diff-privatek8s succeeded Jun 19, 2024 in 0s

Helmfile Diff for cluster privatek8s

Details

Comparing release=cert-manager, chart=jetstack/cert-manager
Comparing release=datadog, chart=datadog/datadog
datadog, datadog-kpi-telemetry-configmap, ConfigMap (v1) has changed:
...
  data:
    install_type: k8s_manual
-   install_id: "aac79451-bf59-4510-bf28-e919f0cb3724"
-   install_time: "1718787128"
+   install_id: "fa85b64d-4b45-40a8-a8eb-ca5ef102c3a8"
+   install_time: "1718788557"

Comparing release=jenkins-infra-agents, chart=jenkins-infra/jenkins-kubernetes-agents
Comparing release=jenkins-infra-jobs, chart=jenkins-infra/jenkins-jobs
Comparing release=jenkins-release-agents, chart=jenkins-infra/jenkins-kubernetes-agents
Comparing release=jenkins-release-core-package, chart=jenkins-infra/env-jenkins-release
Comparing release=public-nginx-ingress, chart=ingress-nginx/ingress-nginx
Comparing release=private-nginx-ingress, chart=ingress-nginx/ingress-nginx
Comparing release=rss2twitter, chart=jenkins-infra/rss2twitter
Comparing release=ircbot, chart=jenkins-infra/ircbot
Comparing release=acme, chart=jenkins-infra/acme
Comparing release=jenkins-infra, chart=jenkins/jenkins
jenkins-infra, jenkins-infra, Secret (v1) has changed:
+ Changes suppressed on sensitive content of type Secret
jenkins-infra, jenkins-infra-jenkins-config-agent-settings, ConfigMap (v1) has changed:
...
                  label: "container kubernetes node ruby webbuilder"
                  yamlMergeStrategy: "merge"
+         - kubernetes:
+             containerCapStr: "100"
+             credentialsId: "infraci.jenkins.io-agents-1-jenkins-agent-sa-token"
+             serverCertificate: |
+               "${INFRACIJENKINSIO_AGENTS_1_CACRT}"
+             serverUrl: "https://infracijenkinsioagents1-ns1jeize.hcp.eastus2.azmk8s.io:443"
+             maxRequestsPerHostStr: "300"
+             webSocket: true
+             name: "kubernetes_infracijioagents1"
+             namespace: "jenkins-infra-agents"
+             podRetention: "Never"
+             podLabels:
+               # Required to be jenkins/<helm-release>-jenkins-slave as defined here
+               # https://github.com/helm/charts/blob/ef0d749132ecfa61b2ea47ccacafeaf5cf1d3d77/stable/jenkins/templates/jenkins-master-networkpolicy.yaml#L27
+               - key: "jenkins/jenkins-infra-agent"
+                 value: "true"
+             templates:
+               - name: jnlp-linux-arm64
+                 nodeSelector: "kubernetes.io/arch=arm64"
+                 containers:
+                   - name: jnlp
+                     image: "jenkinsciinfra/jenkins-agent-ubuntu-22.04:1.72.0"
+                     command: "/usr/local/bin/jenkins-agent"
+                     args: ""
+                     envVars:
+                     - envVar:
+                         key: "JENKINS_JAVA_BIN"
+                         value: "/opt/jdk-17/bin/java"
+                     - envVar:
+                         key: "JAVA_HOME"
+                         value: "/opt/jdk-17"
+                     resourceLimitCpu: "500m"
+                     resourceLimitMemory: "1024Mi"
+                     resourceRequestCpu: "500m"
+                     resourceRequestMemory: "512Mi"
+                     alwaysPullImage: true
+                 label: "linux-arm64-infracijioagents1"
+                 yamlMergeStrategy: "merge"
+                 yaml: |-
+                   apiVersion: v1
+                   kind: Pod
+                   spec:
+                     tolerations:
+                     - key: "jenkins"
+                       operator: "Equal"
+                       value: "infra.ci.jenkins.io"
+                       effect: "NoSchedule"
+                     - key: "kubernetes.io/arch"
+                       operator: "Equal"
+                       value: "arm64"
+                       effect: "NoSchedule"
+                     - key: "infra.ci.jenkins.io/agents"
+                       operator: "Equal"
+                       value: "true"
+                       effect: "NoSchedule"
          - azureVM:
              azureCredentialsId: "azure-jenkins-sponsorship-credentials"
...

Comparing release=jenkins-release, chart=jenkins/jenkins
jenkins-release, jenkins-release, Secret (v1) has changed:
+ Changes suppressed on sensitive content of type Secret

Comparing release=github-comment-ops, chart=github-comment-ops/github-comment-ops