From ca38239df98daacbf9dc3174edb97e5a302d5b96 Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Wed, 18 Oct 2023 18:38:53 -0700 Subject: [PATCH] chore: Post release bumps (#1681) Signed-off-by: d2iq-mergebot Co-authored-by: d2iq-mergebot --- common/kommander-operator/defaults/cm.yaml | 4 ++-- mergebot-config.json | 2 +- services/gatekeeper/3.12.0/pre-upgrade/pre-upgrade.yaml | 2 +- .../{0.6.1 => 0.6.2}/defaults/cm.yaml | 2 +- .../{0.6.1 => 0.6.2}/defaults/kustomization.yaml | 0 .../{0.6.1 => 0.6.2}/kommander-appmanagement.yaml | 4 ++-- .../{0.6.1 => 0.6.2}/kustomization.yaml | 0 services/kommander/{0.6.1 => 0.6.2}/defaults/cm.yaml | 2 +- .../kommander/{0.6.1 => 0.6.2}/defaults/kustomization.yaml | 0 .../{0.6.1 => 0.6.2}/dynamic-helmreleases/README.txt | 0 .../cluster-observer/cluster-observer.yaml | 0 .../cluster-observer/kustomization.yaml | 0 .../dynamic-helmreleases/mtls-proxy/kustomization.yaml | 0 .../dynamic-helmreleases/mtls-proxy/list-images-values.yaml | 0 .../dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml | 0 services/kommander/{0.6.1 => 0.6.2}/kommander.yaml | 6 +++--- services/kommander/{0.6.1 => 0.6.2}/kustomization.yaml | 0 services/kubecost/0.35.1/pre-upgrade/pre-upgrade.yaml | 2 +- .../logging-operator/4.2.3/pre-upgrade/pre-upgrade.yaml | 2 +- 19 files changed, 13 insertions(+), 13 deletions(-) rename services/kommander-appmanagement/{0.6.1 => 0.6.2}/defaults/cm.yaml (95%) rename services/kommander-appmanagement/{0.6.1 => 0.6.2}/defaults/kustomization.yaml (100%) rename services/kommander-appmanagement/{0.6.1 => 0.6.2}/kommander-appmanagement.yaml (83%) rename services/kommander-appmanagement/{0.6.1 => 0.6.2}/kustomization.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/defaults/cm.yaml (98%) rename services/kommander/{0.6.1 => 0.6.2}/defaults/kustomization.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/README.txt (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/cluster-observer/cluster-observer.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/cluster-observer/kustomization.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/mtls-proxy/kustomization.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/mtls-proxy/list-images-values.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml (100%) rename services/kommander/{0.6.1 => 0.6.2}/kommander.yaml (87%) rename services/kommander/{0.6.1 => 0.6.2}/kustomization.yaml (100%) diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml index 54270103b..4c6f4f12e 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.2-dev}" kubetools: image: - tag: "${kommanderChartVersion:=v2.6.1-dev}" + tag: "${kommanderChartVersion:=v2.6.2-dev}" diff --git a/mergebot-config.json b/mergebot-config.json index fcbd5851e..4e98a904c 100644 --- a/mergebot-config.json +++ b/mergebot-config.json @@ -12,7 +12,7 @@ "main": "DKP 2.7.0", "release-2.4": "DKP 2.4.3", "release-2.5": "DKP 2.5.3", - "release-2.6": "DKP 2.6.1" + "release-2.6": "DKP 2.6.2" }, "jira_regex": "((?:COPS|D2IQ)-\\d+)" }, 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 44e031ae4..3d33fe01d 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.2-dev}" command: - sh - "-c" diff --git a/services/kommander-appmanagement/0.6.1/defaults/cm.yaml b/services/kommander-appmanagement/0.6.2/defaults/cm.yaml similarity index 95% rename from services/kommander-appmanagement/0.6.1/defaults/cm.yaml rename to services/kommander-appmanagement/0.6.2/defaults/cm.yaml index 430240bb1..7e45cac5d 100644 --- a/services/kommander-appmanagement/0.6.1/defaults/cm.yaml +++ b/services/kommander-appmanagement/0.6.2/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kommander-appmanagement-0.6.1-d2iq-defaults + name: kommander-appmanagement-0.6.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kommander-appmanagement/0.6.1/defaults/kustomization.yaml b/services/kommander-appmanagement/0.6.2/defaults/kustomization.yaml similarity index 100% rename from services/kommander-appmanagement/0.6.1/defaults/kustomization.yaml rename to services/kommander-appmanagement/0.6.2/defaults/kustomization.yaml diff --git a/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.6.2/kommander-appmanagement.yaml similarity index 83% rename from services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml rename to services/kommander-appmanagement/0.6.2/kommander-appmanagement.yaml index bcd608a2c..674b715e3 100644 --- a/services/kommander-appmanagement/0.6.1/kommander-appmanagement.yaml +++ b/services/kommander-appmanagement/0.6.2/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.2-dev}" interval: 15s install: crds: CreateReplace @@ -25,4 +25,4 @@ spec: releaseName: kommander-appmanagement valuesFrom: - kind: ConfigMap - name: kommander-appmanagement-0.6.1-d2iq-defaults + name: kommander-appmanagement-0.6.2-d2iq-defaults diff --git a/services/kommander-appmanagement/0.6.1/kustomization.yaml b/services/kommander-appmanagement/0.6.2/kustomization.yaml similarity index 100% rename from services/kommander-appmanagement/0.6.1/kustomization.yaml rename to services/kommander-appmanagement/0.6.2/kustomization.yaml diff --git a/services/kommander/0.6.1/defaults/cm.yaml b/services/kommander/0.6.2/defaults/cm.yaml similarity index 98% rename from services/kommander/0.6.1/defaults/cm.yaml rename to services/kommander/0.6.2/defaults/cm.yaml index bbb354992..13c5e1633 100644 --- a/services/kommander/0.6.1/defaults/cm.yaml +++ b/services/kommander/0.6.2/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kommander-0.6.1-d2iq-defaults + name: kommander-0.6.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kommander/0.6.1/defaults/kustomization.yaml b/services/kommander/0.6.2/defaults/kustomization.yaml similarity index 100% rename from services/kommander/0.6.1/defaults/kustomization.yaml rename to services/kommander/0.6.2/defaults/kustomization.yaml diff --git a/services/kommander/0.6.1/dynamic-helmreleases/README.txt b/services/kommander/0.6.2/dynamic-helmreleases/README.txt similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/README.txt rename to services/kommander/0.6.2/dynamic-helmreleases/README.txt diff --git a/services/kommander/0.6.1/dynamic-helmreleases/cluster-observer/cluster-observer.yaml b/services/kommander/0.6.2/dynamic-helmreleases/cluster-observer/cluster-observer.yaml similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/cluster-observer/cluster-observer.yaml rename to services/kommander/0.6.2/dynamic-helmreleases/cluster-observer/cluster-observer.yaml diff --git a/services/kommander/0.6.1/dynamic-helmreleases/cluster-observer/kustomization.yaml b/services/kommander/0.6.2/dynamic-helmreleases/cluster-observer/kustomization.yaml similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/cluster-observer/kustomization.yaml rename to services/kommander/0.6.2/dynamic-helmreleases/cluster-observer/kustomization.yaml diff --git a/services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/kustomization.yaml b/services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/kustomization.yaml similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/kustomization.yaml rename to services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/kustomization.yaml diff --git a/services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/list-images-values.yaml b/services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/list-images-values.yaml similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/list-images-values.yaml rename to services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/list-images-values.yaml diff --git a/services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml b/services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml similarity index 100% rename from services/kommander/0.6.1/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml rename to services/kommander/0.6.2/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml diff --git a/services/kommander/0.6.1/kommander.yaml b/services/kommander/0.6.2/kommander.yaml similarity index 87% rename from services/kommander/0.6.1/kommander.yaml rename to services/kommander/0.6.2/kommander.yaml index 72add84df..506952d62 100644 --- a/services/kommander/0.6.1/kommander.yaml +++ b/services/kommander/0.6.2/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.2-dev}" 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 @@ -34,7 +34,7 @@ spec: releaseName: kommander valuesFrom: - kind: ConfigMap - name: kommander-0.6.1-d2iq-defaults + name: kommander-0.6.2-d2iq-defaults - kind: ConfigMap - name: kommander-0.6.1-overrides + name: kommander-0.6.2-overrides optional: true diff --git a/services/kommander/0.6.1/kustomization.yaml b/services/kommander/0.6.2/kustomization.yaml similarity index 100% rename from services/kommander/0.6.1/kustomization.yaml rename to services/kommander/0.6.2/kustomization.yaml 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 b9056cd53..31b14e823 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.2-dev}" 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 692097912..c8de96224 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.2-dev}" command: - sh - "-c"