From f09cce26a50b501e21fd40f1cd29cc469bcc5e63 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Fri, 31 May 2024 22:45:01 +0000 Subject: [PATCH 1/2] Replace deprecated kustomize constructs with their new equivalent Signed-off-by: Dom Del Nano --- k8s/cloud_deps/dev/elastic/kustomization.yaml | 17 +++++++++-------- .../prod/elastic/kustomization.yaml | 12 ++++++------ .../public/elastic/kustomization.yaml | 19 ++++++++++--------- .../staging/elastic/kustomization.yaml | 12 ++++++------ .../testing/elastic/kustomization.yaml | 12 ++++++------ 5 files changed, 37 insertions(+), 35 deletions(-) diff --git a/k8s/cloud_deps/dev/elastic/kustomization.yaml b/k8s/cloud_deps/dev/elastic/kustomization.yaml index 33d43d11485..a98f6916f2f 100644 --- a/k8s/cloud_deps/dev/elastic/kustomization.yaml +++ b/k8s/cloud_deps/dev/elastic/kustomization.yaml @@ -1,21 +1,22 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: pl-cloud namespace: plc-dev resources: - ../../base/elastic/cluster -patchesJson6902: +labels: +- includeSelectors: true + pairs: + app: pl-cloud +patches: - path: elastic_storage_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 - path: elastic_replica_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 diff --git a/k8s/cloud_deps/prod/elastic/kustomization.yaml b/k8s/cloud_deps/prod/elastic/kustomization.yaml index 211af970119..a13b580ae19 100644 --- a/k8s/cloud_deps/prod/elastic/kustomization.yaml +++ b/k8s/cloud_deps/prod/elastic/kustomization.yaml @@ -1,8 +1,5 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: pl-cloud namespace: plc resources: - ../../base/elastic/cluster @@ -13,10 +10,13 @@ patches: - path: node_selector_patch.yaml target: kind: Elasticsearch -patchesJson6902: - path: elastic_storage_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 +labels: +- includeSelectors: true + pairs: + app: pl-cloud diff --git a/k8s/cloud_deps/public/elastic/kustomization.yaml b/k8s/cloud_deps/public/elastic/kustomization.yaml index d97e1b2f397..e46388a303c 100644 --- a/k8s/cloud_deps/public/elastic/kustomization.yaml +++ b/k8s/cloud_deps/public/elastic/kustomization.yaml @@ -1,27 +1,28 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: pl-cloud namespace: plc resources: - ../../base/elastic/cluster -patchesJson6902: +labels: +- includeSelectors: true + pairs: + app: pl-cloud +patches: - path: elastic_storage_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 - path: elastic_replica_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 - path: elastic_gcs_plugin.yaml target: + group: elasticsearch.k8s.elastic.co kind: Elasticsearch name: pl-elastic - group: elasticsearch.k8s.elastic.co version: v1 diff --git a/k8s/cloud_deps/staging/elastic/kustomization.yaml b/k8s/cloud_deps/staging/elastic/kustomization.yaml index ee6ccac2d9c..ded20318469 100644 --- a/k8s/cloud_deps/staging/elastic/kustomization.yaml +++ b/k8s/cloud_deps/staging/elastic/kustomization.yaml @@ -1,8 +1,5 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: pl-cloud namespace: plc-staging resources: - ../../base/elastic/cluster @@ -10,10 +7,13 @@ patches: - path: elastic_creds.yaml target: kind: Elasticsearch -patchesJson6902: - path: elastic_storage_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 +labels: +- includeSelectors: true + pairs: + app: pl-cloud diff --git a/k8s/cloud_deps/testing/elastic/kustomization.yaml b/k8s/cloud_deps/testing/elastic/kustomization.yaml index c609f9343c8..7dcf5d53807 100644 --- a/k8s/cloud_deps/testing/elastic/kustomization.yaml +++ b/k8s/cloud_deps/testing/elastic/kustomization.yaml @@ -1,8 +1,5 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: pl-cloud namespace: plc-testing resources: - ../../base/elastic/cluster @@ -10,10 +7,13 @@ patches: - path: elastic_creds.yaml target: kind: Elasticsearch -patchesJson6902: - path: elastic_storage_patch.yaml target: - name: pl-elastic - kind: Elasticsearch group: elasticsearch.k8s.elastic.co + kind: Elasticsearch + name: pl-elastic version: v1 +labels: +- includeSelectors: true + pairs: + app: pl-cloud From 9169ce2ab3ae49b25b0dfd7b4b74eecd6d2b2c5a Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Sat, 1 Jun 2024 15:35:10 +0000 Subject: [PATCH 2/2] Add yaml document start (---) back in Signed-off-by: Dom Del Nano --- k8s/cloud_deps/dev/elastic/kustomization.yaml | 1 + k8s/cloud_deps/prod/elastic/kustomization.yaml | 1 + k8s/cloud_deps/public/elastic/kustomization.yaml | 1 + k8s/cloud_deps/staging/elastic/kustomization.yaml | 1 + k8s/cloud_deps/testing/elastic/kustomization.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/k8s/cloud_deps/dev/elastic/kustomization.yaml b/k8s/cloud_deps/dev/elastic/kustomization.yaml index a98f6916f2f..ed53f533ad5 100644 --- a/k8s/cloud_deps/dev/elastic/kustomization.yaml +++ b/k8s/cloud_deps/dev/elastic/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: plc-dev diff --git a/k8s/cloud_deps/prod/elastic/kustomization.yaml b/k8s/cloud_deps/prod/elastic/kustomization.yaml index a13b580ae19..ced3edc2262 100644 --- a/k8s/cloud_deps/prod/elastic/kustomization.yaml +++ b/k8s/cloud_deps/prod/elastic/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: plc diff --git a/k8s/cloud_deps/public/elastic/kustomization.yaml b/k8s/cloud_deps/public/elastic/kustomization.yaml index e46388a303c..4d0778d35ab 100644 --- a/k8s/cloud_deps/public/elastic/kustomization.yaml +++ b/k8s/cloud_deps/public/elastic/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: plc diff --git a/k8s/cloud_deps/staging/elastic/kustomization.yaml b/k8s/cloud_deps/staging/elastic/kustomization.yaml index ded20318469..7dc3043f9d6 100644 --- a/k8s/cloud_deps/staging/elastic/kustomization.yaml +++ b/k8s/cloud_deps/staging/elastic/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: plc-staging diff --git a/k8s/cloud_deps/testing/elastic/kustomization.yaml b/k8s/cloud_deps/testing/elastic/kustomization.yaml index 7dcf5d53807..ca1ec56697b 100644 --- a/k8s/cloud_deps/testing/elastic/kustomization.yaml +++ b/k8s/cloud_deps/testing/elastic/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: plc-testing