From 1f9f9f1e7168abbf888a1193f75d064f087ac30e Mon Sep 17 00:00:00 2001 From: Venkat-Bramhasani Date: Thu, 17 Oct 2024 20:22:20 +0530 Subject: [PATCH] feat: bump kiwigrid/k8s-sidecar to 1.28.0 (#2742) * feat: bump kiwigrid/k8s-sidecar to 1.27.6 * Update licenses.d2iq.yaml Co-authored-by: Martin Hrabovcin * feat: bump kiwigrid/k8s-sidecar to 1.27.6 * feat: bump kiwigrid/k8s-sidecar to 1.27.6 * feat: bump kiwigrid/k8s-sidecar to 1.27.6 * feat: bump kiwigrid/k8s-sidecar to 1.28.0 --------- Co-authored-by: Martin Hrabovcin --- licenses.d2iq.yaml | 9 ++------- services/centralized-grafana/63.0.0/defaults/cm.yaml | 6 +++--- services/centralized-kubecost/0.37.6/defaults/cm.yaml | 4 ++-- services/grafana-logging/8.3.6/defaults/cm.yaml | 6 +++--- services/kube-prometheus-stack/63.0.0/defaults/cm.yaml | 6 +++--- services/kubecost/0.37.7/defaults/cm.yaml | 4 ++-- services/project-grafana-logging/8.3.5/defaults/cm.yaml | 6 +++--- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 8a031540b..55c908f34 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -77,10 +77,10 @@ resources: - license_path: LICENSE.txt ref: ${image_tag} url: https://github.com/jimmidyson/configmap-reload - - container_image: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar:1.25.3-d2iq.1 + - container_image: docker.io/kiwigrid/k8s-sidecar:1.28.0 sources: - license_path: LICENSE - ref: ${image_tag%-d2iq.1} + ref: ${image_tag} url: https://github.com/kiwigrid/k8s-sidecar - container_image: docker.io/kubernetesui/dashboard-api:1.7.0 sources: @@ -454,11 +454,6 @@ resources: - license_path: LICENSE ref: ${image_tag%-distro} url: https://github.com/kiali/kiali - - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar:1.26.1-d2iq.1 - sources: - - license_path: LICENSE - ref: ${image_tag%-d2iq.1} - url: https://github.com/kiwigrid/k8s-sidecar - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.76.1 sources: - license_path: LICENSE diff --git a/services/centralized-grafana/63.0.0/defaults/cm.yaml b/services/centralized-grafana/63.0.0/defaults/cm.yaml index 799c86af5..dd4cb4b32 100644 --- a/services/centralized-grafana/63.0.0/defaults/cm.yaml +++ b/services/centralized-grafana/63.0.0/defaults/cm.yaml @@ -21,9 +21,9 @@ data: path: "/dkp/kommander/monitoring/grafana/metrics" sidecar: image: - registry: ghcr.io - repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar - tag: 1.26.1-d2iq.1 + registry: docker.io + repository: kiwigrid/k8s-sidecar + tag: 1.28.0 dashboards: enabled: true # label that the configmaps with dashboards are marked with diff --git a/services/centralized-kubecost/0.37.6/defaults/cm.yaml b/services/centralized-kubecost/0.37.6/defaults/cm.yaml index f8568757d..ccda13062 100644 --- a/services/centralized-kubecost/0.37.6/defaults/cm.yaml +++ b/services/centralized-kubecost/0.37.6/defaults/cm.yaml @@ -72,8 +72,8 @@ data: # Grafana itself is not installed. sidecar: image: - repository: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar - tag: 1.25.3-d2iq.0 + repository: docker.io/kiwigrid/k8s-sidecar + tag: 1.28.0 dashboards: enabled: true label: grafana_dashboard_kommander diff --git a/services/grafana-logging/8.3.6/defaults/cm.yaml b/services/grafana-logging/8.3.6/defaults/cm.yaml index 7608f8084..9f8155cfa 100644 --- a/services/grafana-logging/8.3.6/defaults/cm.yaml +++ b/services/grafana-logging/8.3.6/defaults/cm.yaml @@ -29,9 +29,9 @@ data: sidecar: image: - registry: ghcr.io - repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar - tag: 1.26.1-d2iq.1 + registry: docker.io + repository: kiwigrid/k8s-sidecar + tag: 1.28.0 dashboards: enabled: true diff --git a/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml b/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml index 4fc3dfd75..7a61019fd 100644 --- a/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml +++ b/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml @@ -355,9 +355,9 @@ data: pathType: ImplementationSpecific sidecar: image: - registry: ghcr.io - repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar - tag: 1.26.1-d2iq.1 + registry: docker.io + repository: kiwigrid/k8s-sidecar + tag: 1.28.0 dashboards: enabled: true label: grafana_dashboard diff --git a/services/kubecost/0.37.7/defaults/cm.yaml b/services/kubecost/0.37.7/defaults/cm.yaml index 96b3edbb1..2c9a5ecd7 100644 --- a/services/kubecost/0.37.7/defaults/cm.yaml +++ b/services/kubecost/0.37.7/defaults/cm.yaml @@ -120,8 +120,8 @@ data: check_for_updates: false sidecar: image: - repository: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar - tag: 1.25.3-d2iq.1 + repository: docker.io/kiwigrid/k8s-sidecar + tag: 1.28.0 kubecostProductConfigs: grafanaURL: "/dkp/kubecost/grafana" diff --git a/services/project-grafana-logging/8.3.5/defaults/cm.yaml b/services/project-grafana-logging/8.3.5/defaults/cm.yaml index ce15b5422..b2f143893 100644 --- a/services/project-grafana-logging/8.3.5/defaults/cm.yaml +++ b/services/project-grafana-logging/8.3.5/defaults/cm.yaml @@ -29,9 +29,9 @@ data: sidecar: image: - registry: ghcr.io - repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar - tag: 1.26.1-d2iq.1 + registry: docker.io + repository: kiwigrid/k8s-sidecar + tag: 1.28.0 dashboards: enabled: true label: project_grafana_logging_dashboard