From 87f7b49b817c7ca3754a9469e50e291f949acfb8 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Wed, 18 Oct 2023 16:49:48 -0400 Subject: [PATCH 1/4] chore: Dedupe images to reduce airgapped bundle size --- services/gitea/9.3.0/defaults/cm.yaml | 2 +- services/traefik-forward-auth-mgmt/0.3.10/defaults/cm.yaml | 2 +- services/traefik-forward-auth/0.3.10/defaults/cm.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/gitea/9.3.0/defaults/cm.yaml b/services/gitea/9.3.0/defaults/cm.yaml index e64871777..749b63974 100644 --- a/services/gitea/9.3.0/defaults/cm.yaml +++ b/services/gitea/9.3.0/defaults/cm.yaml @@ -84,7 +84,7 @@ data: primary: priorityClassName: "dkp-critical-priority" image: - tag: 11.16.0-debian-11-r9 + tag: 15.2.0-debian-11-r21 persistence: enabled: true create: false diff --git a/services/traefik-forward-auth-mgmt/0.3.10/defaults/cm.yaml b/services/traefik-forward-auth-mgmt/0.3.10/defaults/cm.yaml index c3dea1e05..ef1c8f828 100644 --- a/services/traefik-forward-auth-mgmt/0.3.10/defaults/cm.yaml +++ b/services/traefik-forward-auth-mgmt/0.3.10/defaults/cm.yaml @@ -50,4 +50,4 @@ data: tls: [] deploymentAnnotations: configmap.reloader.stakater.com/reload: "traefik-forward-auth-mgmt-configmap" - addonsInitializer: "${initializerImage:=mesosphere/kubeaddons-addon-initializer:v0.5.5}" + addonsInitializer: "${initializerImage:=mesosphere/kubeaddons-addon-initializer:v0.7.0}" diff --git a/services/traefik-forward-auth/0.3.10/defaults/cm.yaml b/services/traefik-forward-auth/0.3.10/defaults/cm.yaml index 4bf7bf2a4..6087a7915 100644 --- a/services/traefik-forward-auth/0.3.10/defaults/cm.yaml +++ b/services/traefik-forward-auth/0.3.10/defaults/cm.yaml @@ -56,4 +56,4 @@ data: deploymentAnnotations: configmap.reloader.stakater.com/reload: "traefik-forward-auth-configmap" initContainers: null - addonsInitializer: "${initializerImage:=mesosphere/kubeaddons-addon-initializer:v0.5.5}" + addonsInitializer: "${initializerImage:=mesosphere/kubeaddons-addon-initializer:v0.7.0}" From 24f743adcac5f287097e979284f842a22ff26ad2 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Fri, 20 Oct 2023 13:14:20 -0400 Subject: [PATCH 2/4] chore: Use newer postgresql image --- services/dkp-insights/0.6.0/defaults/cm.yaml | 2 ++ services/gitea/9.3.0/defaults/cm.yaml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/dkp-insights/0.6.0/defaults/cm.yaml b/services/dkp-insights/0.6.0/defaults/cm.yaml index 9be78841a..c839ce393 100644 --- a/services/dkp-insights/0.6.0/defaults/cm.yaml +++ b/services/dkp-insights/0.6.0/defaults/cm.yaml @@ -470,6 +470,8 @@ data: cpu: 100m memory: 64Mi postgresql: + image: + tag: 15.4.0-debian-11-r10 global: connectionPool: connectionMaxLifetime: 1h diff --git a/services/gitea/9.3.0/defaults/cm.yaml b/services/gitea/9.3.0/defaults/cm.yaml index 749b63974..f7eb7a466 100644 --- a/services/gitea/9.3.0/defaults/cm.yaml +++ b/services/gitea/9.3.0/defaults/cm.yaml @@ -83,8 +83,6 @@ data: enabled: true primary: priorityClassName: "dkp-critical-priority" - image: - tag: 15.2.0-debian-11-r21 persistence: enabled: true create: false From 6d8d41d1fca49931258c44248331dded74dcea74 Mon Sep 17 00:00:00 2001 From: Brian Mendoza Date: Fri, 20 Oct 2023 16:31:01 -0400 Subject: [PATCH 3/4] chore: Manually update licenses --- licenses.d2iq.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index e5b03cda9..39e68e1d2 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -3,8 +3,7 @@ ignore: - docker.io/mesosphere/kommander2-kubetools - docker.io/nginxinc/nginx-unprivileged:1.22.0-alpine - docker.io/bitnami/external-dns:0.13.6-debian-11-r11 - - docker.io/bitnami/postgresql:11.16.0-debian-11-r9 - - docker.io/bitnami/postgresql:15.2.0-debian-11-r21 + - docker.io/bitnami/postgresql:15.4.0-debian-11-r10 - docker.io/bitnami/redis-cluster:7.0.12-debian-11-r2 - docker.io/library/busybox:1 - gcr.io/kubecost1/cost-model:prod-1.104.0 @@ -260,10 +259,6 @@ resources: sources: - ref: v${image_tag} url: https://github.com/mesosphere/kommander-ui - - container_image: docker.io/mesosphere/kubeaddons-addon-initializer:v0.5.5 - sources: - - ref: ${image_tag} - url: https://github.com/mesosphere/kubeaddons-extrasteps - container_image: docker.io/mesosphere/kubeaddons-addon-initializer:v0.7.0 sources: - ref: ${image_tag} From eb0d270d2f179875255a69b5156fbed5d12fcda8 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 8 Nov 2023 13:00:44 -0800 Subject: [PATCH 4/4] fix: Revert postgres image overrides --- licenses.d2iq.yaml | 3 ++- services/dkp-insights/1.0.0/defaults/cm.yaml | 2 -- services/gitea/8.2.0/defaults/cm.yaml | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 12a639f2c..b60b474ed 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -3,7 +3,8 @@ ignore: - docker.io/mesosphere/kommander2-kubetools - docker.io/nginxinc/nginx-unprivileged:1.22.0-alpine - docker.io/bitnami/external-dns:0.13.6-debian-11-r11 - - docker.io/bitnami/postgresql:15.4.0-debian-11-r10 + - docker.io/bitnami/postgresql:11.16.0-debian-11-r9 + - docker.io/bitnami/postgresql:15.2.0-debian-11-r21 - docker.io/bitnami/redis-cluster:7.0.12-debian-11-r2 - docker.io/bitnami/memcached:1.6.15-debian-11-r8 - docker.io/library/busybox:1 diff --git a/services/dkp-insights/1.0.0/defaults/cm.yaml b/services/dkp-insights/1.0.0/defaults/cm.yaml index b91256a29..b9fb0f962 100644 --- a/services/dkp-insights/1.0.0/defaults/cm.yaml +++ b/services/dkp-insights/1.0.0/defaults/cm.yaml @@ -514,8 +514,6 @@ data: cpu: 100m memory: 64Mi postgresql: - image: - tag: 15.4.0-debian-11-r10 global: connectionPool: connectionMaxLifetime: 1h diff --git a/services/gitea/8.2.0/defaults/cm.yaml b/services/gitea/8.2.0/defaults/cm.yaml index 1d6328bfc..130260b08 100644 --- a/services/gitea/8.2.0/defaults/cm.yaml +++ b/services/gitea/8.2.0/defaults/cm.yaml @@ -69,3 +69,5 @@ data: postgresql: primary: priorityClassName: "dkp-critical-priority" + image: + tag: 11.16.0-debian-11-r9