From 8e161998ed3b72ff1658352b0cf801d910c5c83d Mon Sep 17 00:00:00 2001 From: Deepak Prabhakara Date: Mon, 8 Apr 2024 16:40:28 +0100 Subject: [PATCH] updated skaffold (#2541) --- kustomize/overlays/demo/kustomization.yaml | 14 ++++++++++++-- kustomize/overlays/prod-eu/kustomization.yaml | 14 ++++++++++++-- skaffold-demo-mocksaml-services.yaml | 2 +- skaffold-demo-mocksaml.yaml | 2 +- skaffold-demo-services.yaml | 2 +- skaffold-demo.yaml | 2 +- skaffold-dynamodb.yaml | 2 +- skaffold-mariadb.yaml | 2 +- skaffold-mongo.yaml | 2 +- skaffold-mssql.yaml | 2 +- skaffold-mysql.yaml | 2 +- skaffold-postgres.yaml | 2 +- skaffold-prod-eu-mocksaml-services.yaml | 2 +- skaffold-prod-eu-mocksaml.yaml | 2 +- skaffold-prod-eu-services.yaml | 2 +- skaffold-prod-eu.yaml | 2 +- 16 files changed, 38 insertions(+), 18 deletions(-) diff --git a/kustomize/overlays/demo/kustomization.yaml b/kustomize/overlays/demo/kustomization.yaml index f769c43dd..877fb3e35 100644 --- a/kustomize/overlays/demo/kustomization.yaml +++ b/kustomize/overlays/demo/kustomization.yaml @@ -7,8 +7,18 @@ resources: - ./secrets.yaml patches: - - ./jackson-deployment.yaml - - ./migratepg-job.yaml + - target: + group: apps + version: v1 + kind: Deployment + name: jackson + path: ./jackson-deployment.yaml + - target: + group: batch + version: v1 + kind: Job + name: jackson-migrate-pg + path: ./migratepg-job.yaml images: - name: boxyhq/jackson diff --git a/kustomize/overlays/prod-eu/kustomization.yaml b/kustomize/overlays/prod-eu/kustomization.yaml index f769c43dd..877fb3e35 100644 --- a/kustomize/overlays/prod-eu/kustomization.yaml +++ b/kustomize/overlays/prod-eu/kustomization.yaml @@ -7,8 +7,18 @@ resources: - ./secrets.yaml patches: - - ./jackson-deployment.yaml - - ./migratepg-job.yaml + - target: + group: apps + version: v1 + kind: Deployment + name: jackson + path: ./jackson-deployment.yaml + - target: + group: batch + version: v1 + kind: Job + name: jackson-migrate-pg + path: ./migratepg-job.yaml images: - name: boxyhq/jackson diff --git a/skaffold-demo-mocksaml-services.yaml b/skaffold-demo-mocksaml-services.yaml index cb8bd1c9b..ad1274fa1 100644 --- a/skaffold-demo-mocksaml-services.yaml +++ b/skaffold-demo-mocksaml-services.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-demo-mocksaml.yaml b/skaffold-demo-mocksaml.yaml index 96de50c33..3b9fd8705 100644 --- a/skaffold-demo-mocksaml.yaml +++ b/skaffold-demo-mocksaml.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-demo-services.yaml b/skaffold-demo-services.yaml index 9f9c2bcb8..f86848871 100644 --- a/skaffold-demo-services.yaml +++ b/skaffold-demo-services.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-demo.yaml b/skaffold-demo.yaml index 4284004cd..f4a69bf14 100644 --- a/skaffold-demo.yaml +++ b/skaffold-demo.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-dynamodb.yaml b/skaffold-dynamodb.yaml index b85c1e7eb..457115f86 100644 --- a/skaffold-dynamodb.yaml +++ b/skaffold-dynamodb.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-mariadb.yaml b/skaffold-mariadb.yaml index 6e83026f4..02316c349 100644 --- a/skaffold-mariadb.yaml +++ b/skaffold-mariadb.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-mongo.yaml b/skaffold-mongo.yaml index 48576191d..b39062397 100644 --- a/skaffold-mongo.yaml +++ b/skaffold-mongo.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-mssql.yaml b/skaffold-mssql.yaml index 0d04e30e4..1a59ef61c 100644 --- a/skaffold-mssql.yaml +++ b/skaffold-mssql.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-mysql.yaml b/skaffold-mysql.yaml index 578bffb30..982458c31 100644 --- a/skaffold-mysql.yaml +++ b/skaffold-mysql.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-postgres.yaml b/skaffold-postgres.yaml index 0205f3964..cfbfdd87a 100644 --- a/skaffold-postgres.yaml +++ b/skaffold-postgres.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config build: local: diff --git a/skaffold-prod-eu-mocksaml-services.yaml b/skaffold-prod-eu-mocksaml-services.yaml index 8e369247d..dcf5d3000 100644 --- a/skaffold-prod-eu-mocksaml-services.yaml +++ b/skaffold-prod-eu-mocksaml-services.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-prod-eu-mocksaml.yaml b/skaffold-prod-eu-mocksaml.yaml index c733e34ae..9ad117ad1 100644 --- a/skaffold-prod-eu-mocksaml.yaml +++ b/skaffold-prod-eu-mocksaml.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-prod-eu-services.yaml b/skaffold-prod-eu-services.yaml index 343422e2c..a3a52bbe5 100644 --- a/skaffold-prod-eu-services.yaml +++ b/skaffold-prod-eu-services.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: diff --git a/skaffold-prod-eu.yaml b/skaffold-prod-eu.yaml index 26b41263a..91ff1da39 100644 --- a/skaffold-prod-eu.yaml +++ b/skaffold-prod-eu.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v4beta7 +apiVersion: skaffold/v4beta10 kind: Config manifests: kustomize: