From e8ff0d93a55f31c044ffdc0877c0ae225b68fdb1 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Fri, 30 Dec 2022 08:17:28 +1100
Subject: [PATCH 1/2] migrate all cronjobs to batch/v1 apiVersion

---
 legacy/helmcharts/basic-persistent/templates/cronjob.yaml     | 2 +-
 legacy/helmcharts/basic/templates/cronjob.yaml                | 2 +-
 legacy/helmcharts/cli-persistent/templates/cronjob.yaml       | 2 +-
 legacy/helmcharts/cli/templates/cronjob.yaml                  | 2 +-
 legacy/helmcharts/elasticsearch/templates/cronjob.yaml        | 2 +-
 legacy/helmcharts/kibana/templates/cronjob.yaml               | 2 +-
 legacy/helmcharts/logstash/templates/cronjob.yaml             | 2 +-
 legacy/helmcharts/mariadb-single/templates/cronjob.yaml       | 2 +-
 legacy/helmcharts/mongodb-single/templates/cronjob.yaml       | 2 +-
 legacy/helmcharts/nginx-php-persistent/templates/cronjob.yaml | 2 +-
 legacy/helmcharts/nginx-php/templates/cronjob.yaml            | 2 +-
 legacy/helmcharts/nginx/templates/cronjob.yaml                | 2 +-
 legacy/helmcharts/node-persistent/templates/cronjob.yaml      | 2 +-
 legacy/helmcharts/node/templates/cronjob.yaml                 | 2 +-
 legacy/helmcharts/opensearch/templates/cronjob.yaml           | 2 +-
 legacy/helmcharts/postgres-single/templates/cronjob.yaml      | 2 +-
 legacy/helmcharts/python-persistent/templates/cronjob.yaml    | 2 +-
 legacy/helmcharts/python/templates/cronjob.yaml               | 2 +-
 legacy/helmcharts/rabbitmq/templates/cronjob.yaml             | 2 +-
 legacy/helmcharts/redis-persistent/templates/cronjob.yaml     | 2 +-
 legacy/helmcharts/redis/templates/cronjob.yaml                | 2 +-
 legacy/helmcharts/solr/templates/cronjob.yaml                 | 2 +-
 legacy/helmcharts/varnish-persistent/templates/cronjob.yaml   | 2 +-
 legacy/helmcharts/varnish/templates/cronjob.yaml              | 2 +-
 legacy/helmcharts/worker-persistent/templates/cronjob.yaml    | 2 +-
 legacy/helmcharts/worker/templates/cronjob.yaml               | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/legacy/helmcharts/basic-persistent/templates/cronjob.yaml b/legacy/helmcharts/basic-persistent/templates/cronjob.yaml
index 4cebd810..811dc851 100644
--- a/legacy/helmcharts/basic-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/basic-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/basic/templates/cronjob.yaml b/legacy/helmcharts/basic/templates/cronjob.yaml
index 5e900548..4f46343f 100644
--- a/legacy/helmcharts/basic/templates/cronjob.yaml
+++ b/legacy/helmcharts/basic/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/cli-persistent/templates/cronjob.yaml b/legacy/helmcharts/cli-persistent/templates/cronjob.yaml
index f924891d..ae2e8397 100644
--- a/legacy/helmcharts/cli-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/cli-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/cli/templates/cronjob.yaml b/legacy/helmcharts/cli/templates/cronjob.yaml
index 02587596..a26e88fa 100644
--- a/legacy/helmcharts/cli/templates/cronjob.yaml
+++ b/legacy/helmcharts/cli/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/elasticsearch/templates/cronjob.yaml b/legacy/helmcharts/elasticsearch/templates/cronjob.yaml
index 1456d61d..9fe221b1 100644
--- a/legacy/helmcharts/elasticsearch/templates/cronjob.yaml
+++ b/legacy/helmcharts/elasticsearch/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/kibana/templates/cronjob.yaml b/legacy/helmcharts/kibana/templates/cronjob.yaml
index 62ad7617..51027ee5 100644
--- a/legacy/helmcharts/kibana/templates/cronjob.yaml
+++ b/legacy/helmcharts/kibana/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/logstash/templates/cronjob.yaml b/legacy/helmcharts/logstash/templates/cronjob.yaml
index 08810382..bd78665d 100644
--- a/legacy/helmcharts/logstash/templates/cronjob.yaml
+++ b/legacy/helmcharts/logstash/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/mariadb-single/templates/cronjob.yaml b/legacy/helmcharts/mariadb-single/templates/cronjob.yaml
index 00eff4a3..19f60dd9 100644
--- a/legacy/helmcharts/mariadb-single/templates/cronjob.yaml
+++ b/legacy/helmcharts/mariadb-single/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/mongodb-single/templates/cronjob.yaml b/legacy/helmcharts/mongodb-single/templates/cronjob.yaml
index 5cd0e6d4..58f04950 100644
--- a/legacy/helmcharts/mongodb-single/templates/cronjob.yaml
+++ b/legacy/helmcharts/mongodb-single/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/nginx-php-persistent/templates/cronjob.yaml b/legacy/helmcharts/nginx-php-persistent/templates/cronjob.yaml
index 951087fe..7a262edb 100644
--- a/legacy/helmcharts/nginx-php-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/nginx-php-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/nginx-php/templates/cronjob.yaml b/legacy/helmcharts/nginx-php/templates/cronjob.yaml
index a78cf00a..4d84a01d 100644
--- a/legacy/helmcharts/nginx-php/templates/cronjob.yaml
+++ b/legacy/helmcharts/nginx-php/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/nginx/templates/cronjob.yaml b/legacy/helmcharts/nginx/templates/cronjob.yaml
index ebe87149..2a9d8fb1 100644
--- a/legacy/helmcharts/nginx/templates/cronjob.yaml
+++ b/legacy/helmcharts/nginx/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/node-persistent/templates/cronjob.yaml b/legacy/helmcharts/node-persistent/templates/cronjob.yaml
index aa132b39..b441913b 100644
--- a/legacy/helmcharts/node-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/node-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/node/templates/cronjob.yaml b/legacy/helmcharts/node/templates/cronjob.yaml
index 5f1b7dac..ec020437 100644
--- a/legacy/helmcharts/node/templates/cronjob.yaml
+++ b/legacy/helmcharts/node/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/opensearch/templates/cronjob.yaml b/legacy/helmcharts/opensearch/templates/cronjob.yaml
index bc2bdbc7..c21b9188 100644
--- a/legacy/helmcharts/opensearch/templates/cronjob.yaml
+++ b/legacy/helmcharts/opensearch/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/postgres-single/templates/cronjob.yaml b/legacy/helmcharts/postgres-single/templates/cronjob.yaml
index 6fad3768..58444cac 100644
--- a/legacy/helmcharts/postgres-single/templates/cronjob.yaml
+++ b/legacy/helmcharts/postgres-single/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/python-persistent/templates/cronjob.yaml b/legacy/helmcharts/python-persistent/templates/cronjob.yaml
index f45194a1..dbd0e71a 100644
--- a/legacy/helmcharts/python-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/python-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/python/templates/cronjob.yaml b/legacy/helmcharts/python/templates/cronjob.yaml
index eef33127..c417594f 100644
--- a/legacy/helmcharts/python/templates/cronjob.yaml
+++ b/legacy/helmcharts/python/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/rabbitmq/templates/cronjob.yaml b/legacy/helmcharts/rabbitmq/templates/cronjob.yaml
index 7b7eb602..f2abe773 100644
--- a/legacy/helmcharts/rabbitmq/templates/cronjob.yaml
+++ b/legacy/helmcharts/rabbitmq/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/redis-persistent/templates/cronjob.yaml b/legacy/helmcharts/redis-persistent/templates/cronjob.yaml
index 7a779abd..37cfc4b4 100644
--- a/legacy/helmcharts/redis-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/redis-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/redis/templates/cronjob.yaml b/legacy/helmcharts/redis/templates/cronjob.yaml
index 20c392c6..33ce28c5 100644
--- a/legacy/helmcharts/redis/templates/cronjob.yaml
+++ b/legacy/helmcharts/redis/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/solr/templates/cronjob.yaml b/legacy/helmcharts/solr/templates/cronjob.yaml
index d2e808d0..77ea09a3 100644
--- a/legacy/helmcharts/solr/templates/cronjob.yaml
+++ b/legacy/helmcharts/solr/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/varnish-persistent/templates/cronjob.yaml b/legacy/helmcharts/varnish-persistent/templates/cronjob.yaml
index 586c25af..882950c0 100644
--- a/legacy/helmcharts/varnish-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/varnish-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/varnish/templates/cronjob.yaml b/legacy/helmcharts/varnish/templates/cronjob.yaml
index 4de207cb..eff2a006 100644
--- a/legacy/helmcharts/varnish/templates/cronjob.yaml
+++ b/legacy/helmcharts/varnish/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/worker-persistent/templates/cronjob.yaml b/legacy/helmcharts/worker-persistent/templates/cronjob.yaml
index 8c55b46f..643a414a 100644
--- a/legacy/helmcharts/worker-persistent/templates/cronjob.yaml
+++ b/legacy/helmcharts/worker-persistent/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
diff --git a/legacy/helmcharts/worker/templates/cronjob.yaml b/legacy/helmcharts/worker/templates/cronjob.yaml
index 74733188..54193c64 100644
--- a/legacy/helmcharts/worker/templates/cronjob.yaml
+++ b/legacy/helmcharts/worker/templates/cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}

From 3224e77542510284311fd4e5f45fe050f0c79cfc Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Fri, 3 Feb 2023 15:23:58 +1100
Subject: [PATCH 2/2] fix openssh version mismatch

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fae26c67..f184a4c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,7 +71,7 @@ ENV KUBECTL_VERSION=v1.20.4 \
 
 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing aufs-util \
     && apk add --update openssl curl jq parallel \
-    && apk add --no-cache bash git openssh py-pip skopeo \
+    && apk add --no-cache bash git openssh-client-common=9.1_p1-r2 openssh=9.1_p1-r2 py-pip skopeo \
     && git config --global user.email "lagoon@lagoon.io" && git config --global user.name lagoon \
     && pip install shyaml yq \
     && curl -Lo /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \