Merge pull request #164 from uselagoon/batchv1_cronjob

uselagoon · Feb 3, 2023 · b3d4a88 · b3d4a88
2 parents fee988f + 3224e77
commit b3d4a88
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 27 deletions.
diff --git 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 "[email protected]" && 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 \

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 {{- range $cronjobName, $cronjobConfig := .Values.nativeCronjobs }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}