From 2a1fedb34f5f2134e3efe5b3ac635bec8c2226b5 Mon Sep 17 00:00:00 2001
From: d2iq-mergebot <ci-mergebot@d2iq.com>
Date: Wed, 18 Oct 2023 14:06:48 +0000
Subject: [PATCH] feat: Release v2.6.1

Signed-off-by: d2iq-mergebot <ci-mergebot@d2iq.com>
---
 common/kommander-operator/defaults/cm.yaml                    | 4 ++--
 services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml       | 2 +-
 .../0.6.1/kommander-appmanagement.yaml                        | 2 +-
 services/kommander/0.6.1/defaults/cm.yaml                     | 2 +-
 services/kommander/0.6.1/kommander.yaml                       | 2 +-
 services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml         | 2 +-
 services/logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml
index 54270103b7..ffa51e9a9d 100644
--- a/common/kommander-operator/defaults/cm.yaml
+++ b/common/kommander-operator/defaults/cm.yaml
@@ -7,7 +7,7 @@ data:
   values.yaml: |
     kommanderoperator:
       image:
-        tag: "${kommanderChartVersion:=v2.6.1-dev}"
+        tag: "${kommanderChartVersion:=v2.6.1}"
     kubetools:
       image:
-        tag: "${kommanderChartVersion:=v2.6.1-dev}"
+        tag: "${kommanderChartVersion:=v2.6.1}"
diff --git a/services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml b/services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml
index 44e031ae4d..d2b8808809 100644
--- a/services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml
+++ b/services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml
@@ -47,7 +47,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: kubetools
-          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1-dev}"
+          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1}"
           command:
             - sh
             - "-c"
diff --git a/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml
index bcd608a2c1..ad70382223 100644
--- a/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml
+++ b/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml
@@ -12,7 +12,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.6.1-dev}"
+      version: "${kommanderChartVersion:=v2.6.1}"
   interval: 15s
   install:
     crds: CreateReplace
diff --git a/services/kommander/0.6.1/defaults/cm.yaml b/services/kommander/0.6.1/defaults/cm.yaml
index bbb354992d..4a155d0357 100644
--- a/services/kommander/0.6.1/defaults/cm.yaml
+++ b/services/kommander/0.6.1/defaults/cm.yaml
@@ -79,7 +79,7 @@ data:
       enabled: false
     capimate:
       image:
-        tag: v0.0.0-dev.0
+        tag: v2.6.1
     managementApps:
     - "centralized-grafana"
     - "centralized-kubecost"
diff --git a/services/kommander/0.6.1/kommander.yaml b/services/kommander/0.6.1/kommander.yaml
index 72add84dfc..bd4f4b0acc 100644
--- a/services/kommander/0.6.1/kommander.yaml
+++ b/services/kommander/0.6.1/kommander.yaml
@@ -17,7 +17,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.6.1-dev}"
+      version: "${kommanderChartVersion:=v2.6.1}"
   interval: 15s
   # Kommander is quite a big chart and it may need some more time than
   # other charts to get ready so setting this to 10 minutes increases
diff --git a/services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml b/services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml
index b9056cd535..77adda4fb5 100644
--- a/services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml
+++ b/services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml
@@ -47,7 +47,7 @@ spec:
       priorityClassName: dkp-high-priority
       containers:
         - name: kubetools
-          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1-dev}"
+          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1}"
           command:
             - sh
             - "-c"
diff --git a/services/logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml b/services/logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml
index 692097912d..e4a80fc2c9 100644
--- a/services/logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml
+++ b/services/logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml
@@ -47,7 +47,7 @@ spec:
       priorityClassName: dkp-critical-priority
       containers:
         - name: kubetools
-          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1-dev}"
+          image: "mesosphere/kommander2-kubetools:${kommanderChartVersion:=v2.6.1}"
           command:
             - sh
             - "-c"