chore: remove deprecated gcr.io/kubebuilder/kube-rbac-proxy

mesosphere · Dec 13, 2024 · d1a7c85 · d1a7c85
1 parent ab6b082
commit d1a7c85
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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