From 0a4b9ead429bad760897ecca7297c3c117c17eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ma=CC=88der?= <christian.maeder@nxt.engineering>
Date: Fri, 10 Sep 2021 15:21:11 +0200
Subject: [PATCH 1/6] Update to k8up v2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian Mäder <christian.maeder@nxt.engineering>
---
 appuio/k8up/Chart.yaml                        |  5 ++---
 appuio/k8up/README.md                         | 18 ++++++------------
 appuio/k8up/rbac-kustomize/kustomization.yaml |  2 +-
 appuio/k8up/values.yaml                       |  6 +++---
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/appuio/k8up/Chart.yaml b/appuio/k8up/Chart.yaml
index c379dfba..d5137257 100644
--- a/appuio/k8up/Chart.yaml
+++ b/appuio/k8up/Chart.yaml
@@ -6,11 +6,10 @@ keywords:
   - backup
   - operator
   - restic
-version: 1.1.0
-appVersion: v1.2.0
+version: 1.2.0
+appVersion: v2.0.0
 sources:
   - https://github.com/vshn/k8up
-  - https://github.com/vshn/wrestic
 maintainers:
   - name: APPUiO Team
     email: info@appuio.ch
diff --git a/appuio/k8up/README.md b/appuio/k8up/README.md
index ef65f889..c9667708 100644
--- a/appuio/k8up/README.md
+++ b/appuio/k8up/README.md
@@ -1,6 +1,6 @@
 # k8up
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: v1.2.0](https://img.shields.io/badge/AppVersion-v1.2.0-informational?style=flat-square)
+![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: v2.0.0](https://img.shields.io/badge/AppVersion-v2.0.0-informational?style=flat-square)
 
 Kubernetes and OpenShift Backup Operator based on restic
 
@@ -14,9 +14,9 @@ helm install k8up appuio/k8up
 ```
 ```bash
 # Install CRDs for K8s >= 1.16:
-kubectl apply -f https://github.com/vshn/k8up/releases/download/v1.2.0/k8up-crd.yaml
+kubectl apply -f https://github.com/vshn/k8up/releases/download/v2.0.0/k8up-crd.yaml
 # Install CRDs for K8s <= 1.15 (e.g. OpenShift 3.11):
-kubectl apply -f https://github.com/vshn/k8up/releases/download/v1.2.0/k8up-crd-legacy.yaml
+kubectl apply -f https://github.com/vshn/k8up/releases/download/v2.0.0/k8up-crd-legacy.yaml
 ```
 
 <!---
@@ -33,7 +33,6 @@ Edit the README.gotmpl.md template instead.
 ## Source Code
 
 * <https://github.com/vshn/k8up>
-* <https://github.com/vshn/wrestic>
 
 <!---
 The values below are generated with helm-docs!
@@ -48,10 +47,10 @@ Document your changes in values.yaml and let `make docs:helm` generate this sect
 | image.pullPolicy | string | `"IfNotPresent"` | Operator image pull policy |
 | image.registry | string | `"quay.io"` | Operator image registry |
 | image.repository | string | `"vshn/k8up"` | Operator image repository |
-| image.tag | string | `"v1.2.0"` | Operator image tag (version) |
+| image.tag | string | `"v2.0.0"` | Operator image tag (version) |
 | imagePullSecrets | list | `[]` |  |
-| k8up.backupImage.repository | string | `"quay.io/vshn/wrestic"` | The backup runner image repository |
-| k8up.backupImage.tag | string | `"v0.3.2"` | The backup runner image tag |
+| k8up.backupImage.repository | string | `"quay.io/vshn/k8up"` | The backup runner image repository |
+| k8up.backupImage.tag | string | `"v2.0.0"` | The backup runner image tag |
 | k8up.enableLeaderElection | bool | `true` | Specifies whether leader election should be enabled. Disable this for K8s versions < 1.16 |
 | k8up.envVars | list | `[]` | envVars allows the specification of additional environment variables. See [values.yaml](values.yaml) how to specify See documentation which variables are supported. |
 | k8up.globalResources | object | empty values | Specify the resource requests and limits that the Pods should have when they are scheduled by K8up. You are still able to override those via K8up resources, but this gives cluster administrators custom defaults. |
@@ -96,11 +95,6 @@ Document your changes in values.yaml and let `make docs:helm` generate this sect
 * Note: Deployment strategy type has changed from `Recreate` to `RollingUpdate`.
 * CRDs need to be installed separately, they are no longer included in this chart.
 
-## Source Code
-
-* <https://github.com/vshn/k8up>
-* <https://github.com/vshn/wrestic>
-
 <!---
 Common/Useful Link references from values.yaml
 -->
diff --git a/appuio/k8up/rbac-kustomize/kustomization.yaml b/appuio/k8up/rbac-kustomize/kustomization.yaml
index e83ba2b8..04556a96 100644
--- a/appuio/k8up/rbac-kustomize/kustomization.yaml
+++ b/appuio/k8up/rbac-kustomize/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - github.com/vshn/k8up/config/rbac?ref=v1.2.0
+  - github.com/vshn/k8up/config/rbac?ref=v2.0.0
 
 namePrefix: PREFIX-
 namespace: "{{ .Release.Namespace }}"
diff --git a/appuio/k8up/values.yaml b/appuio/k8up/values.yaml
index e8b483ca..4bc459f1 100644
--- a/appuio/k8up/values.yaml
+++ b/appuio/k8up/values.yaml
@@ -10,7 +10,7 @@ image:
   # -- Operator image repository
   repository: vshn/k8up
   # -- Operator image tag (version)
-  tag: v1.2.0
+  tag: v2.0.0
 
 imagePullSecrets: []
 serviceAccount:
@@ -33,9 +33,9 @@ k8up:
 
   backupImage:
     # -- The backup runner image repository
-    repository: quay.io/vshn/wrestic
+    repository: quay.io/vshn/k8up
     # -- The backup runner image tag
-    tag: v0.3.2
+    tag: v2.0.0
 
   # -- Specifies the timezone K8up is using for scheduling.
   # Empty value defaults to the timezone in which Kubernetes is deployed.

From a62e08cde00e9807ae88bd0e83eab30c0905dfa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=A4der?= <cimnine@users.noreply.github.com>
Date: Fri, 10 Sep 2021 15:40:42 +0200
Subject: [PATCH 2/6] Update appuio/k8up/Chart.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Chris <github.account@chrigel.net>
Signed-off-by: Christian Mäder <christian.maeder@nxt.engineering>
---
 appuio/k8up/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appuio/k8up/Chart.yaml b/appuio/k8up/Chart.yaml
index d5137257..d7ef5653 100644
--- a/appuio/k8up/Chart.yaml
+++ b/appuio/k8up/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - backup
   - operator
   - restic
-version: 1.2.0
+version: 2.0.0
 appVersion: v2.0.0
 sources:
   - https://github.com/vshn/k8up

From c0146d4f3151955aca070e6771d5b6b45fb54c2b Mon Sep 17 00:00:00 2001
From: cimnine <christian.maeder@nxt.engineering>
Date: Fri, 17 Sep 2021 17:34:08 +0200
Subject: [PATCH 3/6] Update vshn/k8up to k8up-io/k8up

Signed-off-by: cimnine <christian.maeder@nxt.engineering>
---
 appuio/k8up/Chart.yaml                        |  2 +-
 appuio/k8up/README.gotmpl.md                  |  4 ++--
 appuio/k8up/README.md                         | 12 ++++++------
 appuio/k8up/rbac-kustomize/kustomization.yaml |  2 +-
 appuio/k8up/values.yaml                       |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/appuio/k8up/Chart.yaml b/appuio/k8up/Chart.yaml
index d7ef5653..8399ae67 100644
--- a/appuio/k8up/Chart.yaml
+++ b/appuio/k8up/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
 version: 2.0.0
 appVersion: v2.0.0
 sources:
-  - https://github.com/vshn/k8up
+  - https://github.com/k8up-io/k8up
 maintainers:
   - name: APPUiO Team
     email: info@appuio.ch
diff --git a/appuio/k8up/README.gotmpl.md b/appuio/k8up/README.gotmpl.md
index 6289f017..246f2374 100644
--- a/appuio/k8up/README.gotmpl.md
+++ b/appuio/k8up/README.gotmpl.md
@@ -1,8 +1,8 @@
 ```bash
 # Install CRDs for K8s >= 1.16:
-kubectl apply -f https://github.com/vshn/k8up/releases/download/{{ template "chart.appVersion" . }}/k8up-crd.yaml
+kubectl apply -f https://github.com/k8up-io/k8up/releases/download/{{ template "chart.appVersion" . }}/k8up-crd.yaml
 # Install CRDs for K8s <= 1.15 (e.g. OpenShift 3.11):
-kubectl apply -f https://github.com/vshn/k8up/releases/download/{{ template "chart.appVersion" . }}/k8up-crd-legacy.yaml
+kubectl apply -f https://github.com/k8up-io/k8up/releases/download/{{ template "chart.appVersion" . }}/k8up-crd-legacy.yaml
 ```
 
 <!---
diff --git a/appuio/k8up/README.md b/appuio/k8up/README.md
index c9667708..b958ed96 100644
--- a/appuio/k8up/README.md
+++ b/appuio/k8up/README.md
@@ -14,9 +14,9 @@ helm install k8up appuio/k8up
 ```
 ```bash
 # Install CRDs for K8s >= 1.16:
-kubectl apply -f https://github.com/vshn/k8up/releases/download/v2.0.0/k8up-crd.yaml
+kubectl apply -f https://github.com/k8up-io/k8up/releases/download/v2.0.0/k8up-crd.yaml
 # Install CRDs for K8s <= 1.15 (e.g. OpenShift 3.11):
-kubectl apply -f https://github.com/vshn/k8up/releases/download/v2.0.0/k8up-crd-legacy.yaml
+kubectl apply -f https://github.com/k8up-io/k8up/releases/download/v2.0.0/k8up-crd-legacy.yaml
 ```
 
 <!---
@@ -32,7 +32,7 @@ Edit the README.gotmpl.md template instead.
 
 ## Source Code
 
-* <https://github.com/vshn/k8up>
+* <https://github.com/k8up-io/k8up>
 
 <!---
 The values below are generated with helm-docs!
@@ -45,11 +45,11 @@ Document your changes in values.yaml and let `make docs:helm` generate this sect
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Operator image pull policy |
-| image.registry | string | `"quay.io"` | Operator image registry |
-| image.repository | string | `"vshn/k8up"` | Operator image repository |
+| image.registry | string | `"ghcr.io"` | Operator image registry |
+| image.repository | string | `"k8up-io/k8up"` | Operator image repository |
 | image.tag | string | `"v2.0.0"` | Operator image tag (version) |
 | imagePullSecrets | list | `[]` |  |
-| k8up.backupImage.repository | string | `"quay.io/vshn/k8up"` | The backup runner image repository |
+| k8up.backupImage.repository | string | `"ghcr.io/k8up-io/k8up"` | The backup runner image repository |
 | k8up.backupImage.tag | string | `"v2.0.0"` | The backup runner image tag |
 | k8up.enableLeaderElection | bool | `true` | Specifies whether leader election should be enabled. Disable this for K8s versions < 1.16 |
 | k8up.envVars | list | `[]` | envVars allows the specification of additional environment variables. See [values.yaml](values.yaml) how to specify See documentation which variables are supported. |
diff --git a/appuio/k8up/rbac-kustomize/kustomization.yaml b/appuio/k8up/rbac-kustomize/kustomization.yaml
index 04556a96..3d4e4888 100644
--- a/appuio/k8up/rbac-kustomize/kustomization.yaml
+++ b/appuio/k8up/rbac-kustomize/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - github.com/vshn/k8up/config/rbac?ref=v2.0.0
+  - github.com/k8up-io/k8up/config/rbac?ref=v2.0.0
 
 namePrefix: PREFIX-
 namespace: "{{ .Release.Namespace }}"
diff --git a/appuio/k8up/values.yaml b/appuio/k8up/values.yaml
index 4bc459f1..f8700add 100644
--- a/appuio/k8up/values.yaml
+++ b/appuio/k8up/values.yaml
@@ -6,9 +6,9 @@ image:
   # -- Operator image pull policy
   pullPolicy: IfNotPresent
   # -- Operator image registry
-  registry: quay.io
+  registry: ghcr.io
   # -- Operator image repository
-  repository: vshn/k8up
+  repository: k8up-io/k8up
   # -- Operator image tag (version)
   tag: v2.0.0
 
@@ -33,7 +33,7 @@ k8up:
 
   backupImage:
     # -- The backup runner image repository
-    repository: quay.io/vshn/k8up
+    repository: ghcr.io/k8up-io/k8up
     # -- The backup runner image tag
     tag: v2.0.0
 

From fcd03abb6d600199979d716f08c6cd121e78d93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=A4der?= <mail@cimnine.ch>
Date: Tue, 5 Oct 2021 15:59:10 +0200
Subject: [PATCH 4/6] Replace backup.appuio.ch with k8upio in RBAC rules

---
 appuio/k8up/templates/rbac.yaml | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/appuio/k8up/templates/rbac.yaml b/appuio/k8up/templates/rbac.yaml
index 7914ebf4..9897172c 100644
--- a/appuio/k8up/templates/rbac.yaml
+++ b/appuio/k8up/templates/rbac.yaml
@@ -43,7 +43,7 @@ metadata:
   name: {{ include "k8up.fullname" . }}-k8up-edit
 rules:
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - '*'
   verbs:
@@ -64,7 +64,7 @@ metadata:
   name: {{ include "k8up.fullname" . }}-k8up-view
 rules:
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - '*'
   verbs:
@@ -93,7 +93,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - archives
   verbs:
@@ -105,7 +105,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - archives/finalizers
   - archives/status
@@ -114,7 +114,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - backups
   verbs:
@@ -126,7 +126,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - backups/finalizers
   - backups/status
@@ -135,7 +135,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - checks
   verbs:
@@ -147,7 +147,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - checks/finalizers
   - checks/status
@@ -156,7 +156,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - effectiveschedules
   verbs:
@@ -168,13 +168,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - effectiveschedules/finalizers
   verbs:
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - prebackuppods
   verbs:
@@ -186,7 +186,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - prebackuppods/finalizers
   - prebackuppods/status
@@ -195,7 +195,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - prunes
   verbs:
@@ -207,7 +207,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - prunes/finalizers
   - prunes/status
@@ -216,7 +216,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - restores
   verbs:
@@ -228,7 +228,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - restores/finalizers
   - restores/status
@@ -237,7 +237,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - schedules
   verbs:
@@ -249,7 +249,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - backup.appuio.ch
+  - k8up.io
   resources:
   - schedules/finalizers
   - schedules/status

From 0ff794555b9ac3343cc8571b1a022da73d4d01aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=A4der?= <mail@cimnine.ch>
Date: Tue, 5 Oct 2021 16:02:33 +0200
Subject: [PATCH 5/6] Add 'operator' to args of k8up deployment

---
 appuio/k8up/templates/deployment.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appuio/k8up/templates/deployment.yaml b/appuio/k8up/templates/deployment.yaml
index 3b5c2cd2..e93416e6 100644
--- a/appuio/k8up/templates/deployment.yaml
+++ b/appuio/k8up/templates/deployment.yaml
@@ -24,6 +24,7 @@ spec:
         - name: k8up-operator
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args: operator
           env:
           {{- with .Values.k8up.backupImage }}
             - name: BACKUP_IMAGE

From 453393be724cb20f3fbadec2fadac2e9d504c9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=A4der?= <cimnine@users.noreply.github.com>
Date: Fri, 15 Oct 2021 10:05:14 +0200
Subject: [PATCH 6/6] Update appuio/k8up/templates/deployment.yaml

Co-authored-by: Chris <github.account@chrigel.net>
---
 appuio/k8up/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appuio/k8up/templates/deployment.yaml b/appuio/k8up/templates/deployment.yaml
index e93416e6..73dd022d 100644
--- a/appuio/k8up/templates/deployment.yaml
+++ b/appuio/k8up/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
         - name: k8up-operator
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: operator
+          args: [ operator ]
           env:
           {{- with .Values.k8up.backupImage }}
             - name: BACKUP_IMAGE