kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 02:20:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1547 from keleustes/extensions

Browse Source 
Update Ingress apiVersion to networking.k8s.io/v1beta1
This commit is contained in:
Kubernetes Prow Robot
2019-09-20 13:17:26 -07:00
committed by GitHub
parent 0c32691e9e b1faa989f4
commit eeeb4c36a1
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/jsonpatch.md
View File

@@ -16,7 +16,7 @@ resources:
EOF EOF
cat <<EOF >$DEMO_HOME/ingress.yaml cat <<EOF >$DEMO_HOME/ingress.yaml
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: my-ingress name: my-ingress
@@ -72,7 +72,7 @@ Apply the patch by adding _patchesJson6902_ field in kustomization.yaml
cat <<EOF >>$DEMO_HOME/kustomization.yaml cat <<EOF >>$DEMO_HOME/kustomization.yaml
patchesJson6902: patchesJson6902:
- target: - target:
group: extensions group: networking.k8s.io
version: v1beta1 version: v1beta1
kind: Ingress kind: Ingress
name: my-ingress name: my-ingress
@@ -102,7 +102,7 @@ If the patch is YAML-formatted, it will be parsed correctly:
cat <<EOF >>$DEMO_HOME/kustomization.yaml cat <<EOF >>$DEMO_HOME/kustomization.yaml
patchesJson6902: patchesJson6902:
- target: - target:
group: extensions group: networking.k8s.io
version: v1beta1 version: v1beta1
kind: Ingress kind: Ingress
name: my-ingress name: my-ingress

8
examples/zh/jsonpatch.md
View File

@@ -16,7 +16,7 @@ resources:
EOF EOF
cat <<EOF >$DEMO_HOME/ingress.yaml cat <<EOF >$DEMO_HOME/ingress.yaml
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: my-ingress name: my-ingress
@@ -72,7 +72,7 @@ EOF
cat <<EOF >>$DEMO_HOME/kustomization.yaml cat <<EOF >>$DEMO_HOME/kustomization.yaml
patchesJson6902: patchesJson6902:
- target: - target:
group: extensions group: networking.k8s.io
version: v1beta1 version: v1beta1
kind: Ingress kind: Ingress
name: my-ingress name: my-ingress
@@ -106,7 +106,7 @@ test 1 == \
cat <<EOF >>$DEMO_HOME/kustomization.yaml cat <<EOF >>$DEMO_HOME/kustomization.yaml
patchesJson6902: patchesJson6902:
- target: - target:
group: extensions group: networking.k8s.io
version: v1beta1 version: v1beta1
kind: Ingress kind: Ingress
name: my-ingress name: my-ingress
@@ -121,4 +121,4 @@ EOF
test 1 == \ test 1 == \
$(kustomize build $DEMO_HOME | grep "path: /test" | wc -l); \ $(kustomize build $DEMO_HOME | grep "path: /test" | wc -l); \
echo $? echo $?
``` ```

4
pkg/target/variableref_test.go
View File

@@ -987,7 +987,7 @@ spec:
containerPort: 80 containerPort: 80
`) `)
th.WriteF("/app/base/ingress.yaml", ` th.WriteF("/app/base/ingress.yaml", `
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: nginx name: nginx
@@ -1066,7 +1066,7 @@ spec:
- containerPort: 80 - containerPort: 80
name: http name: http
--- ---
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
labels: labels:

4
pkg/transformers/namereference_test.go
View File

@@ -52,7 +52,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
}, },
}).Add( }).Add(
map[string]interface{}{ map[string]interface{}{
"group": "extensions", "group": "networking.k8s.io",
"apiVersion": "v1beta1", "apiVersion": "v1beta1",
"kind": "Ingress", "kind": "Ingress",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
@@ -375,7 +375,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
}, },
}).ReplaceResource( }).ReplaceResource(
map[string]interface{}{ map[string]interface{}{
"group": "extensions", "group": "networking.k8s.io",
"apiVersion": "v1beta1", "apiVersion": "v1beta1",
"kind": "Ingress", "kind": "Ingress",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{