From b1faa989f4f5f047bcb2519a57d9375451bc1bab Mon Sep 17 00:00:00 2001 From: Jerome Brette Date: Fri, 20 Sep 2019 18:14:55 +0000 Subject: [PATCH] Update Ingress apiVersion to networking.k8s.io/v1beta1 --- examples/jsonpatch.md | 6 +++--- examples/zh/jsonpatch.md | 8 ++++---- pkg/target/variableref_test.go | 4 ++-- pkg/transformers/namereference_test.go | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/jsonpatch.md b/examples/jsonpatch.md index b2f334c91..8028c5cc4 100644 --- a/examples/jsonpatch.md +++ b/examples/jsonpatch.md @@ -16,7 +16,7 @@ resources: EOF cat <$DEMO_HOME/ingress.yaml -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: my-ingress @@ -72,7 +72,7 @@ Apply the patch by adding _patchesJson6902_ field in kustomization.yaml cat <>$DEMO_HOME/kustomization.yaml patchesJson6902: - target: - group: extensions + group: networking.k8s.io version: v1beta1 kind: Ingress name: my-ingress @@ -102,7 +102,7 @@ If the patch is YAML-formatted, it will be parsed correctly: cat <>$DEMO_HOME/kustomization.yaml patchesJson6902: - target: - group: extensions + group: networking.k8s.io version: v1beta1 kind: Ingress name: my-ingress diff --git a/examples/zh/jsonpatch.md b/examples/zh/jsonpatch.md index 454cdf5e4..5bb44d58d 100644 --- a/examples/zh/jsonpatch.md +++ b/examples/zh/jsonpatch.md @@ -16,7 +16,7 @@ resources: EOF cat <$DEMO_HOME/ingress.yaml -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: my-ingress @@ -72,7 +72,7 @@ EOF cat <>$DEMO_HOME/kustomization.yaml patchesJson6902: - target: - group: extensions + group: networking.k8s.io version: v1beta1 kind: Ingress name: my-ingress @@ -106,7 +106,7 @@ test 1 == \ cat <>$DEMO_HOME/kustomization.yaml patchesJson6902: - target: - group: extensions + group: networking.k8s.io version: v1beta1 kind: Ingress name: my-ingress @@ -121,4 +121,4 @@ EOF test 1 == \ $(kustomize build $DEMO_HOME | grep "path: /test" | wc -l); \ echo $? -``` \ No newline at end of file +``` diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go index e4ba55aa4..6c5101573 100644 --- a/pkg/target/variableref_test.go +++ b/pkg/target/variableref_test.go @@ -987,7 +987,7 @@ spec: containerPort: 80 `) th.WriteF("/app/base/ingress.yaml", ` -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: nginx @@ -1066,7 +1066,7 @@ spec: - containerPort: 80 name: http --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: labels: diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 623860bff..0f87e75b6 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -52,7 +52,7 @@ func TestNameReferenceHappyRun(t *testing.T) { }, }).Add( map[string]interface{}{ - "group": "extensions", + "group": "networking.k8s.io", "apiVersion": "v1beta1", "kind": "Ingress", "metadata": map[string]interface{}{ @@ -375,7 +375,7 @@ func TestNameReferenceHappyRun(t *testing.T) { }, }).ReplaceResource( map[string]interface{}{ - "group": "extensions", + "group": "networking.k8s.io", "apiVersion": "v1beta1", "kind": "Ingress", "metadata": map[string]interface{}{