From f907ff4c1a2835508b82f0acac9d4083b1a4bd76 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Wed, 18 Oct 2023 16:47:14 -0400 Subject: [PATCH 1/4] chore: Dedupe images to reduce airgapped bundle size --- stable/dex/values.yaml | 2 +- .../templates/cert-federation.yaml | 4 ++-- stable/kubecost/README.md | 6 +++--- stable/kubecost/values.yaml | 14 +++++++++++--- .../templates/object-bucket-claim.yaml | 2 +- staging/knative/charts/serving/values.yaml | 2 +- .../patch/patch_6_mesosphere_values.sh | 2 +- staging/kube-prometheus-stack/values.yaml | 2 +- staging/velero/templates/cleanup-crd.yaml | 2 +- staging/velero/values.yaml | 2 +- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/stable/dex/values.yaml b/stable/dex/values.yaml index 1bdf479d5..910fe2b16 100644 --- a/stable/dex/values.yaml +++ b/stable/dex/values.yaml @@ -22,7 +22,7 @@ initContainers: [] priorityClassName: "" # kubectl image to use for jobs -kubectlImage: "bitnami/kubectl:1.26.4" +kubectlImage: "bitnami/kubectl:1.27.6" tolerations: [] # - key: CriticalAddonsOnly diff --git a/stable/kommander-cert-federation/templates/cert-federation.yaml b/stable/kommander-cert-federation/templates/cert-federation.yaml index 6eb50033b..a15abaaad 100644 --- a/stable/kommander-cert-federation/templates/cert-federation.yaml +++ b/stable/kommander-cert-federation/templates/cert-federation.yaml @@ -103,7 +103,7 @@ spec: initContainers: # These initContainers should run at most once (should succeed only once). - name: patch-secret - image: bitnami/kubectl:1.24.1 + image: bitnami/kubectl:1.27.6 command: - sh - "-c" @@ -138,7 +138,7 @@ spec: containers: # This is a dummy container to ensure deployment is Running. It will be restarted by reloader if/when certs are renewed. - name: wait-for-renewal - image: bitnami/kubectl:1.24.1 + image: bitnami/kubectl:1.27.6 command: - sh - "-c" diff --git a/stable/kubecost/README.md b/stable/kubecost/README.md index 60c7d7e13..84110e324 100644 --- a/stable/kubecost/README.md +++ b/stable/kubecost/README.md @@ -9,7 +9,7 @@ hooks: # Creates configmap to pass kube-system ns uid as envvar to kubecost. clusterID: enabled: true - kubectlImage: "bitnami/kubectl:1.24.1" + kubectlImage: "bitnami/kubectl:1.27.6" cost-analyzer: enabled: true @@ -123,7 +123,7 @@ cost-analyzer: enabled: true sidecarContainers: - name: thanos-sidecar - image: thanosio/thanos:v0.15.0 + image: thanosio/thanos:v0.29.0 args: - sidecar - --log.level=debug @@ -155,7 +155,7 @@ cost-analyzer: alertmanager: enabled: true image: - tag: v0.21.0 + tag: v0.25.0 resources: limits: cpu: 50m diff --git a/stable/kubecost/values.yaml b/stable/kubecost/values.yaml index 98aaabc3e..2ded4b0ed 100644 --- a/stable/kubecost/values.yaml +++ b/stable/kubecost/values.yaml @@ -8,7 +8,7 @@ hooks: # Creates configmap to pass kube-system ns uid as envvar to kubecost. clusterID: enabled: true - kubectlImage: "bitnami/kubectl:1.24.1" + kubectlImage: "bitnami/kubectl:1.27.6" priorityClassName: "" cost-analyzer: @@ -41,6 +41,10 @@ cost-analyzer: # storageClass: "-" prometheus: + kube-state-metrics: + image: + tag: v2.9.2 + nodeExporter: enabled: false serviceAccounts: @@ -67,6 +71,8 @@ cost-analyzer: action: keep regex: {{ .Release.Name }}-network-costs server: + image: + tag: v2.45.0 # If clusterIDConfigmap is defined, instead use user-generated configmap with key CLUSTER_ID # to use as unique cluster ID in kubecost cost-analyzer deployment. # This overrides the cluster_id set in prometheus.server.global.external_labels. @@ -105,7 +111,7 @@ cost-analyzer: enabled: true sidecarContainers: - name: thanos-sidecar - image: thanosio/thanos:v0.15.0 + image: thanosio/thanos:v0.29.0 args: - sidecar - --log.level=debug @@ -137,7 +143,7 @@ cost-analyzer: alertmanager: enabled: true image: - tag: v0.21.0 + tag: v0.25.0 resources: limits: cpu: 50m @@ -179,6 +185,8 @@ cost-analyzer: severity: warning grafana: + image: + tag: 9.5.7 sidecar: dashboards: enabled: true diff --git a/stable/object-bucket-claim/templates/object-bucket-claim.yaml b/stable/object-bucket-claim/templates/object-bucket-claim.yaml index 3b75c1514..9e5794eae 100644 --- a/stable/object-bucket-claim/templates/object-bucket-claim.yaml +++ b/stable/object-bucket-claim/templates/object-bucket-claim.yaml @@ -78,7 +78,7 @@ spec: {{- end }} containers: - name: kubectl - image: "bitnami/kubectl:1.24.1" + image: "bitnami/kubectl:1.27.6" command: - sh - -c diff --git a/staging/knative/charts/serving/values.yaml b/staging/knative/charts/serving/values.yaml index 65777ebc8..73efed961 100644 --- a/staging/knative/charts/serving/values.yaml +++ b/staging/knative/charts/serving/values.yaml @@ -1,7 +1,7 @@ global: serviceLabels: {} image: docker.io/bitnami/kubectl - tag: 1.24.1 + tag: 1.27.6 autoscaler: containerConcurrencyTargetPercentage: "70" diff --git a/staging/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh b/staging/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh index b25126de6..f8c5f68de 100755 --- a/staging/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh +++ b/staging/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh @@ -19,7 +19,7 @@ mesosphereResources: elasticsearch: false velero: false hooks: - kubectlImage: bitnami/kubectl:1.24.1 + kubectlImage: bitnami/kubectl:1.27.6 prometheus: jobName: prom-get-cluster-id configmapName: cluster-info-configmap diff --git a/staging/kube-prometheus-stack/values.yaml b/staging/kube-prometheus-stack/values.yaml index d819c8e67..daec4376b 100644 --- a/staging/kube-prometheus-stack/values.yaml +++ b/staging/kube-prometheus-stack/values.yaml @@ -4050,7 +4050,7 @@ mesosphereResources: elasticsearch: false velero: false hooks: - kubectlImage: bitnami/kubectl:1.24.1 + kubectlImage: bitnami/kubectl:1.27.6 prometheus: jobName: prom-get-cluster-id configmapName: cluster-info-configmap diff --git a/staging/velero/templates/cleanup-crd.yaml b/staging/velero/templates/cleanup-crd.yaml index 1c01d1631..5601af285 100644 --- a/staging/velero/templates/cleanup-crd.yaml +++ b/staging/velero/templates/cleanup-crd.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: {{ include "velero.serverServiceAccount" . }} containers: - name: kubectl - image: bitnami/kubectl:1.24.1 + image: bitnami/kubectl:1.27.6 imagePullPolicy: IfNotPresent command: - /bin/sh diff --git a/staging/velero/values.yaml b/staging/velero/values.yaml index 6e2544733..ba456be70 100755 --- a/staging/velero/values.yaml +++ b/staging/velero/values.yaml @@ -301,4 +301,4 @@ minioBackend: false ## End of additional Velero resource settings. ## -kubectlImage: "bitnami/kubectl:1.24.1" +kubectlImage: "bitnami/kubectl:1.27.6" From 85f6ddd52e2102d92f8ae11be443d2352ff5bd78 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Wed, 18 Oct 2023 16:59:23 -0400 Subject: [PATCH 2/4] chore: Bump charts --- stable/dex/Chart.yaml | 2 +- stable/kommander-cert-federation/Chart.yaml | 2 +- stable/kubecost/Chart.yaml | 2 +- stable/object-bucket-claim/Chart.yaml | 2 +- staging/knative/Chart.yaml | 2 +- staging/kube-prometheus-stack/Chart.yaml | 2 +- staging/velero/Chart.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stable/dex/Chart.yaml b/stable/dex/Chart.yaml index 8fa05ec7a..3bacd27e2 100644 --- a/stable/dex/Chart.yaml +++ b/stable/dex/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: dex -version: 2.12.4 +version: 2.12.5 appVersion: 2.35.3 description: Dex keywords: diff --git a/stable/kommander-cert-federation/Chart.yaml b/stable/kommander-cert-federation/Chart.yaml index 22a852cdb..955582871 100644 --- a/stable/kommander-cert-federation/Chart.yaml +++ b/stable/kommander-cert-federation/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart to create and federate TLS certificates used by komman home: https://github.com/mesosphere/charts name: kommander-cert-federation type: application -version: 0.0.5 +version: 0.0.6 maintainers: - name: mikolajb - name: takirala diff --git a/stable/kubecost/Chart.yaml b/stable/kubecost/Chart.yaml index 3dd1aa247..b15721b5e 100644 --- a/stable/kubecost/Chart.yaml +++ b/stable/kubecost/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.106.2 description: Kubecost name: kubecost home: https://github.com/mesosphere/charts -version: 0.37.1 +version: 0.37.2 maintainers: - name: gracedo dependencies: diff --git a/stable/object-bucket-claim/Chart.yaml b/stable/object-bucket-claim/Chart.yaml index ca9e9627e..3744406f0 100644 --- a/stable/object-bucket-claim/Chart.yaml +++ b/stable/object-bucket-claim/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for ObjectBucketClaim to be consumed by other applicat home: https://github.com/mesosphere/charts keywords: - kommander -version: 0.1.7 +version: 0.1.8 appVersion: "0.1.7" maintainers: - name: cwyl02 diff --git a/staging/knative/Chart.yaml b/staging/knative/Chart.yaml index 09fe749bc..3f257593c 100644 --- a/staging/knative/Chart.yaml +++ b/staging/knative/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: knative -version: 1.10.6 +version: 1.10.7 description: "Kubernetes-based platform to build, deploy, and manage modern serverless workloads" home: https://knative.dev/ maintainers: diff --git a/staging/kube-prometheus-stack/Chart.yaml b/staging/kube-prometheus-stack/Chart.yaml index 5dc1a5f4a..c6cc4ed5b 100644 --- a/staging/kube-prometheus-stack/Chart.yaml +++ b/staging/kube-prometheus-stack/Chart.yaml @@ -21,7 +21,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 48.3.2 +version: 48.3.3 appVersion: v0.66.0 kubeVersion: ">=1.16.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/staging/velero/Chart.yaml b/staging/velero/Chart.yaml index 1f83dedde..35e2fdbcb 100755 --- a/staging/velero/Chart.yaml +++ b/staging/velero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.5.2 description: A Helm chart for velero name: velero -version: 3.2.3 +version: 3.2.4 home: https://github.com/vmware-tanzu/velero icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png sources: From 26460e99389cc04cac4588513f7574b41634494b Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Fri, 20 Oct 2023 16:46:24 -0400 Subject: [PATCH 3/4] fix: don't specify prometheus and kube-state-metrics tags --- stable/kubecost/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/kubecost/values.yaml b/stable/kubecost/values.yaml index 2ded4b0ed..1f295b952 100644 --- a/stable/kubecost/values.yaml +++ b/stable/kubecost/values.yaml @@ -41,9 +41,9 @@ cost-analyzer: # storageClass: "-" prometheus: - kube-state-metrics: - image: - tag: v2.9.2 + # kube-state-metrics: + # image: + # tag: v2.9.2 nodeExporter: enabled: false @@ -71,8 +71,8 @@ cost-analyzer: action: keep regex: {{ .Release.Name }}-network-costs server: - image: - tag: v2.45.0 + # image: + # tag: v2.45.0 # If clusterIDConfigmap is defined, instead use user-generated configmap with key CLUSTER_ID # to use as unique cluster ID in kubecost cost-analyzer deployment. # This overrides the cluster_id set in prometheus.server.global.external_labels. From 8c791b60692d0922918857a132e528b06e8a75c1 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Tue, 24 Oct 2023 10:46:08 -0400 Subject: [PATCH 4/4] chore: try with kube-state-metrics v2.9.2 --- stable/kubecost/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/kubecost/values.yaml b/stable/kubecost/values.yaml index 1f295b952..697526e09 100644 --- a/stable/kubecost/values.yaml +++ b/stable/kubecost/values.yaml @@ -41,9 +41,9 @@ cost-analyzer: # storageClass: "-" prometheus: - # kube-state-metrics: - # image: - # tag: v2.9.2 + kube-state-metrics: + image: + tag: v2.9.2 nodeExporter: enabled: false