From b5ad006f6af90da405d3b14f2fc3e3d80730cbfd Mon Sep 17 00:00:00 2001
From: Andreas Kupries <andreas.kupries@suse.com>
Date: Mon, 23 Jan 2023 13:10:10 +0100
Subject: [PATCH] feat: bump epinio to 1.6.1 chore: update/fix patches

---
 .../generated-changes/patch/Chart.yaml.patch  |  4 +--
 .../patch/templates/server.yaml.patch         |  4 +--
 .../generated-changes/patch/values.yaml.patch | 25 +++++++++++--------
 packages/epinio/epinio/package.yaml           |  4 +--
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch b/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch
index 2e0edbf4f..c21b3f239 100644
--- a/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch
+++ b/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch
@@ -13,9 +13,9 @@
 +  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
 +  catalog.cattle.io/release-name: epinio
 +  catalog.cattle.io/type: app
-+  catalog.cattle.io/upstream-version: 1.5.1
++  catalog.cattle.io/upstream-version: 1.6.1
  apiVersion: v2
- appVersion: v1.5.1
+ appVersion: v1.6.1
  dependencies:
 @@ -26,7 +37,7 @@
  description: Epinio deploys Kubernetes applications directly from source code in one
diff --git a/packages/epinio/epinio/generated-changes/patch/templates/server.yaml.patch b/packages/epinio/epinio/generated-changes/patch/templates/server.yaml.patch
index d4a35042d..8158e17df 100644
--- a/packages/epinio/epinio/generated-changes/patch/templates/server.yaml.patch
+++ b/packages/epinio/epinio/generated-changes/patch/templates/server.yaml.patch
@@ -16,7 +16,7 @@
        - name: tmp-volume
          emptyDir: {}
        - name: image-export-volume
-@@ -312,6 +319,8 @@
+@@ -317,6 +324,8 @@
            ports:
              - containerPort: 8030
            volumeMounts:
@@ -25,7 +25,7 @@
            - name: tmp-volume
              mountPath: /tmp
            - name: image-export-volume
-@@ -336,7 +345,7 @@
+@@ -343,7 +352,7 @@
  kind: PersistentVolumeClaim
  metadata:
    name: image-export-pvc
diff --git a/packages/epinio/epinio/generated-changes/patch/values.yaml.patch b/packages/epinio/epinio/generated-changes/patch/values.yaml.patch
index b3ab96423..a4b4702b7 100644
--- a/packages/epinio/epinio/generated-changes/patch/values.yaml.patch
+++ b/packages/epinio/epinio/generated-changes/patch/values.yaml.patch
@@ -1,27 +1,30 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -6,26 +6,20 @@
- email: "epinio@suse.com"
+@@ -7,26 +7,23 @@
+ 
  image:
    epinio:
 -    registry: ghcr.io/
 -    repository: epinio/epinio-server
 -    tag: ""
 +    repository: rancher/mirrored-epinio-epinio-server
-+    tag: v1.5.1
++    tag: v1.6.1
    bash:
 -    registry: ghcr.io/
 -    repository: epinio/epinio-unpacker
+-    tag: ""
 +    repository: rancher/mirrored-epinio-epinio-unpacker
-     tag: "1.0"
++    tag: v1.6.1
    awscli:
 -    repository: amazon/aws-cli
 +    repository: rancher/mirrored-amazon-aws-cli
-     tag: 2.9.0
--  skopeo:
+     tag: 2.9.14
+   skopeo:
 -    registry: quay.io/
 -    repository: skopeo/stable
 -    tag: v1.10
++    repository: rancher/mirrored-skopeo-skopeo
++    tag: v1.10.0
    kubectl:
      repository: rancher/kubectl
      tag: v1.22.6
@@ -29,11 +32,11 @@
 -    repository: paketobuildpacks/builder
 -    tag: full
 +    repository: rancher/mirrored-paketobuildpacks-builder
-+    tag: 0.2.234-full
++    tag: 0.2.289-full
+ 
  server:
    # Domain which serves the Rancher UI (to access the API)
-   accessControlAllowOrigin: ""
-@@ -116,10 +110,10 @@
+@@ -123,10 +120,10 @@
    enabled: true
    image:
      registry:
@@ -46,9 +49,9 @@
        tag: 1.23.2-alpine
    imagePullPolicy: IfNotPresent
    # The ingressClassName is used to select the ingress controller. If
-@@ -129,6 +123,8 @@
-   # Enable service catalog service for development
+@@ -138,6 +135,8 @@
    enableDevServices: true
+ 
  global:
 +  rbac:
 +    pspEnabled: true
diff --git a/packages/epinio/epinio/package.yaml b/packages/epinio/epinio/package.yaml
index 3eff497a0..a9ce567c2 100644
--- a/packages/epinio/epinio/package.yaml
+++ b/packages/epinio/epinio/package.yaml
@@ -1,5 +1,5 @@
-url: https://github.com/epinio/helm-charts/releases/download/epinio-1.5.1/epinio-1.5.1.tgz
-version: 101.0.2
+url: https://github.com/epinio/helm-charts/releases/download/epinio-1.6.1/epinio-1.6.1.tgz
+version: 101.0.3
 additionalCharts:
   - workingDir: charts-crd
     crdOptions: