From d1a7c85301f5d0d37842cd469e1e4373f1ee6ce9 Mon Sep 17 00:00:00 2001 From: Venkat-Bramhasani Date: Fri, 13 Dec 2024 14:16:50 +0530 Subject: [PATCH] chore: remove deprecated gcr.io/kubebuilder/kube-rbac-proxy --- common/kommander-operator/defaults/cm.yaml | 7 ------- .../0.8.3/kommander-appmanagement.yaml | 4 ---- services/kommander/0.8.3/kommander.yaml | 4 ---- 3 files changed, 15 deletions(-) diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml index 7a031c507..9b5d2f96e 100644 --- a/common/kommander-operator/defaults/cm.yaml +++ b/common/kommander-operator/defaults/cm.yaml @@ -7,14 +7,7 @@ data: values.yaml: | kommanderoperator: image: -<<<<<<< HEAD tag: "${kommanderChartVersion:=v2.8}" kubetools: image: tag: "${kommanderChartVersion:=v2.8}" -======= - tag: "${kommanderChartVersion:=v2.8.3-dev}" - kubetools: - image: - tag: "${kommanderChartVersion:=v2.8.3-dev}" ->>>>>>> origin/release-2.8 diff --git a/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml index adf25df11..64bc14490 100644 --- a/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml +++ b/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml @@ -12,11 +12,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux -<<<<<<< HEAD:services/kommander-appmanagement/0.8.2/kommander-appmanagement.yaml version: "${kommanderChartVersion:=v2.8}" -======= - version: "${kommanderChartVersion:=v2.8.3-dev}" ->>>>>>> origin/release-2.8:services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml interval: 15s install: crds: CreateReplace diff --git a/services/kommander/0.8.3/kommander.yaml b/services/kommander/0.8.3/kommander.yaml index 739714692..89fec50ce 100644 --- a/services/kommander/0.8.3/kommander.yaml +++ b/services/kommander/0.8.3/kommander.yaml @@ -17,11 +17,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux -<<<<<<< HEAD:services/kommander/0.8.2/kommander.yaml version: "${kommanderChartVersion:=v2.8}" -======= - version: "${kommanderChartVersion:=v2.8.3-dev}" ->>>>>>> origin/release-2.8:services/kommander/0.8.3/kommander.yaml 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