Adjust appcat tag

vshn · Nov 7, 2023 · be4f4a0 · be4f4a0
1 parent 70bc71d
commit be4f4a0
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 73 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -39,7 +39,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: sli_minio
+        tag: v4.40.0
       apiserver:
         registry: ghcr.io
         repository: vshn/appcat-apiserver

diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,11 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.39.0
-=======
-          image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          image: ghcr.io/vshn/appcat:v4.40.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,11 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.39.0
-=======
-        image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+        image: ghcr.io/vshn/appcat:v4.40.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -25,11 +25,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-<<<<<<< HEAD
-          imageTag: v4.39.0
-=======
-          imageTag: sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          imageTag: v4.40.0
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io
           minioChartVersion: 5.0.13

diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,11 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.39.0
-=======
-          image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          image: ghcr.io/vshn/appcat:v4.40.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -30,11 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-<<<<<<< HEAD
-              image: ghcr.io/vshn/appcat:v4.39.0
-=======
-              image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+              image: ghcr.io/vshn/appcat:v4.40.0
               name: sla-reporter
               resources:
                 limits:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,11 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.39.0
-=======
-        image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+        image: ghcr.io/vshn/appcat:v4.40.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,11 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.39.0
-=======
-        image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+        image: ghcr.io/vshn/appcat:v4.40.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml
@@ -25,11 +25,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-<<<<<<< HEAD
-          imageTag: v4.39.0
-=======
-          imageTag: sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          imageTag: v4.40.0
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io
           minioChartVersion: 5.0.13

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -33,11 +33,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: myuser@example.com
           externalDatabaseConnectionsEnabled: 'true'
-<<<<<<< HEAD
-          imageTag: v4.39.0
-=======
-          imageTag: sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          imageTag: v4.40.0
           quotasEnabled: 'false'
           sgNamespace: stackgres
           sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "2Gi"},

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
@@ -33,11 +33,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: myuser@example.com
           externalDatabaseConnectionsEnabled: 'true'
-<<<<<<< HEAD
-          imageTag: v4.39.0
-=======
-          imageTag: sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          imageTag: v4.40.0
           quotasEnabled: 'false'
           sgNamespace: stackgres
           sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "2Gi"},

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -30,11 +30,7 @@ spec:
         data:
           bucketRegion: lpg
           controlNamespace: syn-appcat-control
-<<<<<<< HEAD
-          imageTag: v4.39.0
-=======
-          imageTag: sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          imageTag: v4.40.0
           maintenanceSA: helm-based-service-maintenance
           quotasEnabled: 'false'
           restoreSA: redisrestoreserviceaccount

diff --git a/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,11 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.39.0
-=======
-          image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+          image: ghcr.io/vshn/appcat:v4.40.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -30,11 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-<<<<<<< HEAD
-              image: ghcr.io/vshn/appcat:v4.39.0
-=======
-              image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+              image: ghcr.io/vshn/appcat:v4.40.0
               name: sla-reporter
               resources:
                 limits:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,11 +28,7 @@ spec:
           value: "true"
         - name: APPCAT_SLI_VSHNREDIS
           value: "true"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.39.0
-=======
-        image: ghcr.io/vshn/appcat:sli_minio
->>>>>>> 713106c (Switch to sli_minio image)
+        image: ghcr.io/vshn/appcat:v4.40.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/package/main.yaml b/package/main.yaml
@@ -3,11 +3,11 @@ applications:
   - crossplane
 parameters:
   pkg.appcat:
-    componentVersion: add/minio_sla
+    componentVersion: v2.6.0
     image:
       registry: ghcr.io
       repository: vshn/appcat
-      tag: sli_minio
+      tag: v4.40.0
   components:
     appcat:
       url: https://github.com/vshn/component-appcat.git