Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated kustomize constructs with their new equivalent #1937

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions k8s/cloud_deps/dev/elastic/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
---
ddelnano marked this conversation as resolved.
Show resolved Hide resolved
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
11 changes: 6 additions & 5 deletions k8s/cloud_deps/prod/elastic/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonLabels:
app: pl-cloud
namespace: plc
resources:
- ../../base/elastic/cluster
Expand All @@ -13,10 +11,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
18 changes: 10 additions & 8 deletions k8s/cloud_deps/public/elastic/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
---
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
11 changes: 6 additions & 5 deletions k8s/cloud_deps/staging/elastic/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonLabels:
app: pl-cloud
namespace: plc-staging
resources:
- ../../base/elastic/cluster
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
11 changes: 6 additions & 5 deletions k8s/cloud_deps/testing/elastic/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonLabels:
app: pl-cloud
namespace: plc-testing
resources:
- ../../base/elastic/cluster
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
Loading