From 6135b0df4858e916d6bd5705ca63a43c885153bf Mon Sep 17 00:00:00 2001 From: Grace Do Date: Thu, 9 Nov 2023 17:04:11 -0800 Subject: [PATCH] chore: Dedupe images to reduce airgapped bundle size (#1469) * chore: Dedupe images to reduce airgapped bundle size * chore: Bump charts * fix: don't specify prometheus and kube-state-metrics tags * chore: try with kube-state-metrics v2.9.2 * feat(kubecost): Update thanos image to 0.32.5 * fix: Use kubectl 1.26.4 To avoid having to bump kubectl in all apps in k-apps, it would be easier to just align to the existing image in k-apps for now, in case there are errors with the newer version. * fix(kubecost): Revert image updates CI is failing, revert for now to tackle in separate PR. --------- Co-authored-by: Brian Mendoza --- stable/kommander-cert-federation/Chart.yaml | 2 +- .../kommander-cert-federation/templates/cert-federation.yaml | 4 ++-- stable/object-bucket-claim/Chart.yaml | 2 +- stable/object-bucket-claim/templates/object-bucket-claim.yaml | 2 +- staging/knative/Chart.yaml | 2 +- staging/knative/charts/serving/values.yaml | 2 +- staging/kube-prometheus-stack/Chart.yaml | 2 +- .../kube-prometheus-stack/patch/patch_6_mesosphere_values.sh | 2 +- staging/kube-prometheus-stack/values.yaml | 2 +- staging/velero/Chart.yaml | 2 +- staging/velero/templates/cleanup-crd.yaml | 2 +- staging/velero/values.yaml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) 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/kommander-cert-federation/templates/cert-federation.yaml b/stable/kommander-cert-federation/templates/cert-federation.yaml index 6eb50033b..5d42d4ee3 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.26.4 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.26.4 command: - sh - "-c" 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/stable/object-bucket-claim/templates/object-bucket-claim.yaml b/stable/object-bucket-claim/templates/object-bucket-claim.yaml index 3b75c1514..62bcc4fee 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.26.4" command: - sh - -c 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/knative/charts/serving/values.yaml b/staging/knative/charts/serving/values.yaml index 65777ebc8..3757b8874 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.26.4 autoscaler: containerConcurrencyTargetPercentage: "70" 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/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh b/staging/kube-prometheus-stack/patch/patch_6_mesosphere_values.sh index b25126de6..a276247d7 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.26.4 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..248cb5ab8 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.26.4 prometheus: jobName: prom-get-cluster-id configmapName: cluster-info-configmap 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: diff --git a/staging/velero/templates/cleanup-crd.yaml b/staging/velero/templates/cleanup-crd.yaml index 1c01d1631..6890e4085 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.26.4 imagePullPolicy: IfNotPresent command: - /bin/sh diff --git a/staging/velero/values.yaml b/staging/velero/values.yaml index 6e2544733..fdba27516 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.26.4"