From a7f67c65379ebef1d01d29f3d9051d22d560e25c Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Thu, 21 Nov 2024 17:24:25 +0000 Subject: [PATCH] chore: Post release bumps Signed-off-by: d2iq-mergebot --- common/kommander-operator/defaults/cm.yaml | 4 +- .../{0.13.0 => 0.14.0}/defaults/cm.yaml | 2 +- .../defaults/kustomization.yaml | 0 .../kommander-appmanagement.yaml | 4 +- .../{0.13.0 => 0.14.0}/kustomization.yaml | 0 services/kommander/0.13.0/extra-images.txt | 1 - .../{0.13.0 => 0.14.0}/defaults/cm.yaml | 2 +- .../defaults/kustomization.yaml | 0 .../dynamic-helmreleases/README.txt | 0 .../cluster-observer/cluster-observer.yaml | 0 .../cluster-observer/kustomization.yaml | 0 .../cluster-observer/list-images-values.yaml | 0 .../mtls-proxy/kustomization.yaml | 0 .../mtls-proxy/list-images-values.yaml | 0 .../mtls-proxy/mtls-proxy.yaml | 0 services/kommander/0.14.0/extra-images.txt | 1 + .../{0.13.0 => 0.14.0}/kommander.yaml | 4 +- .../{0.13.0 => 0.14.0}/kustomization.yaml | 0 upgrade-matrix.yaml | 45 ++++++++++++------- 19 files changed, 39 insertions(+), 24 deletions(-) rename services/kommander-appmanagement/{0.13.0 => 0.14.0}/defaults/cm.yaml (95%) rename services/kommander-appmanagement/{0.13.0 => 0.14.0}/defaults/kustomization.yaml (100%) rename services/kommander-appmanagement/{0.13.0 => 0.14.0}/kommander-appmanagement.yaml (85%) rename services/kommander-appmanagement/{0.13.0 => 0.14.0}/kustomization.yaml (100%) delete mode 100644 services/kommander/0.13.0/extra-images.txt rename services/kommander/{0.13.0 => 0.14.0}/defaults/cm.yaml (98%) rename services/kommander/{0.13.0 => 0.14.0}/defaults/kustomization.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/README.txt (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/cluster-observer/cluster-observer.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/cluster-observer/kustomization.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/cluster-observer/list-images-values.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/mtls-proxy/kustomization.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/mtls-proxy/list-images-values.yaml (100%) rename services/kommander/{0.13.0 => 0.14.0}/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml (100%) create mode 100644 services/kommander/0.14.0/extra-images.txt rename services/kommander/{0.13.0 => 0.14.0}/kommander.yaml (91%) rename services/kommander/{0.13.0 => 0.14.0}/kustomization.yaml (100%) diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml index 48ca5372a..7a1526393 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.13.0-dev}" + tag: "${kommanderChartVersion:=v2.14.0-dev}" kubetools: image: - tag: "${kommanderChartVersion:=v2.13.0-dev}" + tag: "${kommanderChartVersion:=v2.14.0-dev}" diff --git a/services/kommander-appmanagement/0.13.0/defaults/cm.yaml b/services/kommander-appmanagement/0.14.0/defaults/cm.yaml similarity index 95% rename from services/kommander-appmanagement/0.13.0/defaults/cm.yaml rename to services/kommander-appmanagement/0.14.0/defaults/cm.yaml index e68e4321f..7dec37676 100644 --- a/services/kommander-appmanagement/0.13.0/defaults/cm.yaml +++ b/services/kommander-appmanagement/0.14.0/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kommander-appmanagement-0.13.0-d2iq-defaults + name: kommander-appmanagement-0.14.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kommander-appmanagement/0.13.0/defaults/kustomization.yaml b/services/kommander-appmanagement/0.14.0/defaults/kustomization.yaml similarity index 100% rename from services/kommander-appmanagement/0.13.0/defaults/kustomization.yaml rename to services/kommander-appmanagement/0.14.0/defaults/kustomization.yaml diff --git a/services/kommander-appmanagement/0.13.0/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.14.0/kommander-appmanagement.yaml similarity index 85% rename from services/kommander-appmanagement/0.13.0/kommander-appmanagement.yaml rename to services/kommander-appmanagement/0.14.0/kommander-appmanagement.yaml index 9e8eada7f..e8fd42f82 100644 --- a/services/kommander-appmanagement/0.13.0/kommander-appmanagement.yaml +++ b/services/kommander-appmanagement/0.14.0/kommander-appmanagement.yaml @@ -12,7 +12,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux - version: "${kommanderChartVersion:=v2.13.0-dev}" + version: "${kommanderChartVersion:=v2.14.0-dev}" interval: 15s install: crds: CreateReplace @@ -25,7 +25,7 @@ spec: releaseName: kommander-appmanagement valuesFrom: - kind: ConfigMap - name: kommander-appmanagement-0.13.0-d2iq-defaults + name: kommander-appmanagement-0.14.0-d2iq-defaults - kind: ConfigMap name: kommander-appmanagement-overrides optional: true diff --git a/services/kommander-appmanagement/0.13.0/kustomization.yaml b/services/kommander-appmanagement/0.14.0/kustomization.yaml similarity index 100% rename from services/kommander-appmanagement/0.13.0/kustomization.yaml rename to services/kommander-appmanagement/0.14.0/kustomization.yaml diff --git a/services/kommander/0.13.0/extra-images.txt b/services/kommander/0.13.0/extra-images.txt deleted file mode 100644 index 046ce1a28..000000000 --- a/services/kommander/0.13.0/extra-images.txt +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/mesosphere/kommander-applications-server:v2.13.0-dev diff --git a/services/kommander/0.13.0/defaults/cm.yaml b/services/kommander/0.14.0/defaults/cm.yaml similarity index 98% rename from services/kommander/0.13.0/defaults/cm.yaml rename to services/kommander/0.14.0/defaults/cm.yaml index c88603c51..53e7f152e 100644 --- a/services/kommander/0.13.0/defaults/cm.yaml +++ b/services/kommander/0.14.0/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kommander-0.13.0-d2iq-defaults + name: kommander-0.14.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kommander/0.13.0/defaults/kustomization.yaml b/services/kommander/0.14.0/defaults/kustomization.yaml similarity index 100% rename from services/kommander/0.13.0/defaults/kustomization.yaml rename to services/kommander/0.14.0/defaults/kustomization.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/README.txt b/services/kommander/0.14.0/dynamic-helmreleases/README.txt similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/README.txt rename to services/kommander/0.14.0/dynamic-helmreleases/README.txt diff --git a/services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/cluster-observer.yaml b/services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/cluster-observer.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/cluster-observer.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/cluster-observer.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/kustomization.yaml b/services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/kustomization.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/kustomization.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/kustomization.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/list-images-values.yaml b/services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/list-images-values.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/cluster-observer/list-images-values.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/cluster-observer/list-images-values.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/kustomization.yaml b/services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/kustomization.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/kustomization.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/kustomization.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/list-images-values.yaml b/services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/list-images-values.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/list-images-values.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/list-images-values.yaml diff --git a/services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml b/services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml similarity index 100% rename from services/kommander/0.13.0/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml rename to services/kommander/0.14.0/dynamic-helmreleases/mtls-proxy/mtls-proxy.yaml diff --git a/services/kommander/0.14.0/extra-images.txt b/services/kommander/0.14.0/extra-images.txt new file mode 100644 index 000000000..eda61b44f --- /dev/null +++ b/services/kommander/0.14.0/extra-images.txt @@ -0,0 +1 @@ +ghcr.io/mesosphere/kommander-applications-server:v2.14.0-dev diff --git a/services/kommander/0.13.0/kommander.yaml b/services/kommander/0.14.0/kommander.yaml similarity index 91% rename from services/kommander/0.13.0/kommander.yaml rename to services/kommander/0.14.0/kommander.yaml index cb7ced5f0..ca2342620 100644 --- a/services/kommander/0.13.0/kommander.yaml +++ b/services/kommander/0.14.0/kommander.yaml @@ -17,7 +17,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux - version: "${kommanderChartVersion:=v2.13.0-dev}" + version: "${kommanderChartVersion:=v2.14.0-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.13.0-d2iq-defaults + name: kommander-0.14.0-d2iq-defaults - kind: ConfigMap name: kommander-overrides optional: true diff --git a/services/kommander/0.13.0/kustomization.yaml b/services/kommander/0.14.0/kustomization.yaml similarity index 100% rename from services/kommander/0.13.0/kustomization.yaml rename to services/kommander/0.14.0/kustomization.yaml diff --git a/upgrade-matrix.yaml b/upgrade-matrix.yaml index 5eded1b35..a9a76cb95 100644 --- a/upgrade-matrix.yaml +++ b/upgrade-matrix.yaml @@ -3,57 +3,69 @@ upgrades: to: v2.6.3-dev k8sversion: "1.26" - from: v2.6.0 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.26" - from: v2.6.1 to: v2.6.3-dev k8sversion: "1.26" - from: v2.6.1 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.26" - from: v2.6.2 to: v2.6.3-dev k8sversion: "1.26" - from: v2.6.2 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.26" - from: v2.6.3-dev - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.26" - from: v2.7.0 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.27" - from: v2.7.0 - to: v2.8.2-dev + to: v2.8.3-dev k8sversion: "1.27" - from: v2.7.1 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.27" - from: v2.7.1 - to: v2.8.2-dev + to: v2.8.3-dev k8sversion: "1.27" - from: v2.7.2 - to: v2.7.3-dev + to: v2.7.4-dev k8sversion: "1.27" - from: v2.7.2 - to: v2.8.2-dev + to: v2.8.3-dev k8sversion: "1.27" - - from: v2.7.3-dev - to: v2.8.2-dev + - from: v2.7.3 + to: v2.7.4-dev + k8sversion: "1.27" + - from: v2.7.3 + to: v2.8.3-dev + k8sversion: "1.27" + - from: v2.7.4-dev + to: v2.8.3-dev k8sversion: "1.27" - from: v2.8.0 - to: v2.8.2-dev + to: v2.8.3-dev k8sversion: "1.28" - from: v2.8.0 to: v2.12.2-dev k8sversion: "1.28" - from: v2.8.1 - to: v2.8.2-dev + to: v2.8.3-dev k8sversion: "1.28" - from: v2.8.1 to: v2.12.2-dev k8sversion: "1.28" - - from: v2.8.2-dev + - from: v2.8.2 + to: v2.8.3-dev + k8sversion: "1.28" + - from: v2.8.2 + to: v2.12.2-dev + k8sversion: "1.28" + - from: v2.8.3-dev to: v2.12.2-dev k8sversion: "1.28" - from: v2.12.0 @@ -71,3 +83,6 @@ upgrades: - from: v2.12.2-dev to: v2.13.0-dev k8sversion: "1.29" + - from: v2.13.0-dev + to: v2.14.0-dev + k8sversion: "1.30"