From b314d047316a72a1459a07137f7253c3c0bf0963 Mon Sep 17 00:00:00 2001 From: Julian Gieseke Date: Tue, 21 Jan 2020 14:01:39 +0100 Subject: [PATCH 1/2] chore: clean up kommander vesions kommander as a chart/product will be 1.0.0 when GA, this unpins its version from kommaner UI --- .../{1.184.x => 1.0.x}/kommander-1.yaml | 4 +- addons/kommander/1.163.x/kommander-1.yaml | 71 ------------------- addons/kommander/1.173.x/kommander-1.yaml | 65 ----------------- 3 files changed, 2 insertions(+), 138 deletions(-) rename addons/kommander/{1.184.x => 1.0.x}/kommander-1.yaml (94%) delete mode 100644 addons/kommander/1.163.x/kommander-1.yaml delete mode 100644 addons/kommander/1.173.x/kommander-1.yaml diff --git a/addons/kommander/1.184.x/kommander-1.yaml b/addons/kommander/1.0.x/kommander-1.yaml similarity index 94% rename from addons/kommander/1.184.x/kommander-1.yaml rename to addons/kommander/1.0.x/kommander-1.yaml index 51e5df2d..3f46d625 100644 --- a/addons/kommander/1.184.x/kommander-1.yaml +++ b/addons/kommander/1.0.x/kommander-1.yaml @@ -6,8 +6,8 @@ metadata: labels: kubeaddons.mesosphere.io/name: kommander annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.184.0-1" - appversion.kubeaddons.mesosphere.io/kommander: "1.184.0" + catalog.kubeaddons.mesosphere.io/addon-revision: "1.0.0-1" + appversion.kubeaddons.mesosphere.io/kommander: "1.0.0" endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander/ui appversion.kubeaddons.mesosphere.io/thanos: 0.3.9 appversion.kubeaddons.mesosphere.io/karma: 1.4.0 diff --git a/addons/kommander/1.163.x/kommander-1.yaml b/addons/kommander/1.163.x/kommander-1.yaml deleted file mode 100644 index bf335a3b..00000000 --- a/addons/kommander/1.163.x/kommander-1.yaml +++ /dev/null @@ -1,71 +0,0 @@ ---- -apiVersion: kubeaddons.mesosphere.io/v1beta1 -kind: ClusterAddon -metadata: - name: kommander - labels: - kubeaddons.mesosphere.io/name: kommander - annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.163.2-1" - appversion.kubeaddons.mesosphere.io/kommander: "1.163.2" - endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander - appversion.kubeaddons.mesosphere.io/thanos: 0.3.9 - appversion.kubeaddons.mesosphere.io/karma: 1.4.0 - endpoint.kubeaddons.mesosphere.io/thanos: /kommander/monitoring/query - endpoint.kubeaddons.mesosphere.io/karma: /kommander/monitoring/karma - docs.kubeaddons.mesosphere.io/thanos: "https://thanos.io/getting-started.md/" - docs.kubeaddons.mesosphere.io/karma: "https://github.com/prymitive/karma" - values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/kommander/values.yaml" - helmv2.kubeaddons.mesosphere.io/upgrade-strategy: "[{\"upgradeFrom\": \"<=0.1.22\", \"strategy\": \"delete\"}]" -spec: - namespace: kommander - kubernetes: - minSupportedVersion: v1.15.6 - requires: - - matchLabels: - kubeaddons.mesosphere.io/name: cert-manager - cloudProvider: - - name: aws - enabled: true - - name: azure - enabled: true - - name: docker - enabled: true - - name: none - enabled: true - chartReference: - chart: kommander - repo: https://mesosphere.github.io/charts/stable - version: 0.3.3 - values: | - --- - ingress: - extraAnnotations: - traefik.ingress.kubernetes.io/priority: "2" - - kommander-cluster-lifecycle: - certificates: - issuer: - name: kubernetes-ca - kind: ClusterIssuer - konvoy: - allowUnofficialReleases: true - - kommander-karma: - karma: - deployment: - annotations: - configmap.reloader.stakater.com/reload: kommander-kubeaddons-config - - federate: - kubeaddons: - image: - repository: "mesosphere/kubeaddons" - tag: "v0.5.3" - pullPolicy: IfNotPresent - - kubeaddons-catalog: - image: - repository: mesosphere/kubeaddons-catalog - tag: "v0.5.3" - pullPolicy: IfNotPresent diff --git a/addons/kommander/1.173.x/kommander-1.yaml b/addons/kommander/1.173.x/kommander-1.yaml deleted file mode 100644 index 9feac2dc..00000000 --- a/addons/kommander/1.173.x/kommander-1.yaml +++ /dev/null @@ -1,65 +0,0 @@ ---- -apiVersion: kubeaddons.mesosphere.io/v1beta1 -kind: ClusterAddon -metadata: - name: kommander - labels: - kubeaddons.mesosphere.io/name: kommander - annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.173.2-1" - appversion.kubeaddons.mesosphere.io/kommander: "1.173.2" - endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander - values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/kommander/values.yaml" - helmv2.kubeaddons.mesosphere.io/upgrade-strategy: '[{"upgradeFrom": "<=0.1.22", "strategy": "delete"}]' -spec: - namespace: kommander - kubernetes: - minSupportedVersion: v1.15.6 - requires: - - matchLabels: - kubeaddons.mesosphere.io/name: cert-manager - cloudProvider: - - name: aws - enabled: true - - name: azure - enabled: true - - name: docker - enabled: true - - name: none - enabled: true - chartReference: - chart: kommander - repo: https://mesosphere.github.io/charts/stable - version: 0.3.9 - values: | - --- - ingress: - extraAnnotations: - traefik.ingress.kubernetes.io/priority: "2" - - kommander-cluster-lifecycle: - certificates: - issuer: - name: kubernetes-ca - kind: ClusterIssuer - konvoy: - allowUnofficialReleases: true - - kommander-karma: - karma: - deployment: - annotations: - configmap.reloader.stakater.com/reload: kommander-kubeaddons-config - - federate: - kubeaddons: - image: - repository: "mesosphere/kubeaddons" - tag: "v0.5.3" - pullPolicy: IfNotPresent - - kubeaddons-catalog: - image: - repository: mesosphere/kubeaddons-catalog - tag: "v0.5.3" - pullPolicy: IfNotPresent From 18010ea75538870a865a57c7f856b56e08f63dbb Mon Sep 17 00:00:00 2001 From: Julian Gieseke Date: Tue, 21 Jan 2020 15:03:48 +0100 Subject: [PATCH 2/2] chore: renaming 1.0.x folder to 1.x we can split up later if necessary --- addons/kommander/{1.0.x => 1.x}/kommander-1.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename addons/kommander/{1.0.x => 1.x}/kommander-1.yaml (100%) diff --git a/addons/kommander/1.0.x/kommander-1.yaml b/addons/kommander/1.x/kommander-1.yaml similarity index 100% rename from addons/kommander/1.0.x/kommander-1.yaml rename to addons/kommander/1.x/kommander-1.yaml