Skip to content

Commit

Permalink
chore: Dedupe images to reduce airgapped bundle size
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Mendoza committed Oct 18, 2023
1 parent 284998b commit f907ff4
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 15 deletions.
2 changes: 1 addition & 1 deletion stable/dex/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions stable/kubecost/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -155,7 +155,7 @@ cost-analyzer:
alertmanager:
enabled: true
image:
tag: v0.21.0
tag: v0.25.0
resources:
limits:
cpu: 50m
Expand Down
14 changes: 11 additions & 3 deletions stable/kubecost/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -41,6 +41,10 @@ cost-analyzer:
# storageClass: "-"

prometheus:
kube-state-metrics:
image:
tag: v2.9.2

nodeExporter:
enabled: false
serviceAccounts:
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -137,7 +143,7 @@ cost-analyzer:
alertmanager:
enabled: true
image:
tag: v0.21.0
tag: v0.25.0
resources:
limits:
cpu: 50m
Expand Down Expand Up @@ -179,6 +185,8 @@ cost-analyzer:
severity: warning

grafana:
image:
tag: 9.5.7
sidecar:
dashboards:
enabled: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
{{- end }}
containers:
- name: kubectl
image: "bitnami/kubectl:1.24.1"
image: "bitnami/kubectl:1.27.6"
command:
- sh
- -c
Expand Down
2 changes: 1 addition & 1 deletion staging/knative/charts/serving/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
global:
serviceLabels: {}
image: docker.io/bitnami/kubectl
tag: 1.24.1
tag: 1.27.6

autoscaler:
containerConcurrencyTargetPercentage: "70"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion staging/kube-prometheus-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion staging/velero/templates/cleanup-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion staging/velero/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,4 @@ minioBackend: false
## End of additional Velero resource settings.
##

kubectlImage: "bitnami/kubectl:1.24.1"
kubectlImage: "bitnami/kubectl:1.27.6"

0 comments on commit f907ff4

Please sign in to comment.