From 7d9f601daaeb24ec858704ea28615bc01512bcc8 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sun, 22 Jan 2023 16:24:58 +0000 Subject: [PATCH] chore: some CI updates,etc --- charts/kubezero-addons/values.yaml | 1 + charts/kubezero-ci/Chart.yaml | 4 ++-- charts/kubezero-ci/values.yaml | 15 +++++++++++---- charts/kubezero-mq/values.yaml | 3 +++ docs/v1.24.md | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/charts/kubezero-addons/values.yaml b/charts/kubezero-addons/values.yaml index 8aae885b..9e8d7168 100644 --- a/charts/kubezero-addons/values.yaml +++ b/charts/kubezero-addons/values.yaml @@ -178,6 +178,7 @@ nvidia-device-plugin: - g5.16xlarge - g5.24xlarge - g5.48xlarge + - g4dn.xlarge cluster-autoscaler: enabled: false diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml index 4a9d6089..fc9ebf82 100644 --- a/charts/kubezero-ci/Chart.yaml +++ b/charts/kubezero-ci/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-ci description: KubeZero umbrella chart for all things CI type: application -version: 0.5.24 +version: 0.5.25 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -26,7 +26,7 @@ dependencies: repository: https://dl.gitea.io/charts/ condition: gitea.enabled - name: jenkins - version: 4.2.17 + version: 4.2.20 repository: https://charts.jenkins.io condition: jenkins.enabled - name: trivy diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index 37062415..b39fa88f 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -121,19 +121,19 @@ jenkins: numToKeepStr: "10" installPlugins: - - kubernetes:3743.v1fa_4c724c3b_7 + - kubernetes:3802.vb_b_600831fcb_3 - workflow-aggregator:581.v0c46fa_697ffd - - git:4.14.3 + - git:5.0.0 - basic-branch-build-strategies:71.vc1421f89888e - pipeline-graph-view:144.vf3924feb_7e35 - pipeline-stage-view:2.28 - configuration-as-code:1569.vb_72405b_80249 - antisamy-markup-formatter:155.v795fb_8702324 - - prometheus:2.0.11 + - prometheus:2.1.0 - htmlpublisher:1.31 - build-discarder:139.v05696a_7fe240 - dark-theme:262.v0202a_4c8fb_6a - - kubernetes-credentials-provider:1.206.v7ce2cf7b_0c8b + - kubernetes-credentials-provider:1.208.v128ee9800c04 serviceAccountAgent: create: true @@ -153,6 +153,13 @@ jenkins: containerCap: 2 annotations: container.apparmor.security.beta.kubernetes.io/jnlp: unconfined + resources: + requests: + cpu: "" + memory: "" + limits: + cpu: "" + memory: "" # envVars: # - name: AWS_WEB_IDENTITY_TOKEN_FILE # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" diff --git a/charts/kubezero-mq/values.yaml b/charts/kubezero-mq/values.yaml index 126c5621..152978ca 100644 --- a/charts/kubezero-mq/values.yaml +++ b/charts/kubezero-mq/values.yaml @@ -59,6 +59,9 @@ rabbitmq: mqtt: false mqtts: false + #extraConfiguration: |- + # mqtt.durable_queue_type = quorum + auth: existingPasswordSecret: rabbitmq existingErlangSecret: rabbitmq diff --git a/docs/v1.24.md b/docs/v1.24.md index dedc8313..cd7be4f7 100644 --- a/docs/v1.24.md +++ b/docs/v1.24.md @@ -38,7 +38,7 @@ Ensure your Kube context points to the correct cluster ! `./admin/upgrade_cluster.sh ` 4. Review the kubezero-config and if all looks good commit the ArgoApp resouce for Kubezero via regular git - git add / commit / push `` + git add / commit / push `` *DO NOT yet re-enable ArgoCD before all pre v1.24 workers have been replaced !!!* 5. Reboot controller(s) one by one