github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Remove uses of extensions/v1beta1 clients

Browse Source
This commit is contained in:
Jordan Liggitt
2018-12-19 11:18:53 -05:00
parent 842bd1e1ec
commit fd9e9b01b1
44 changed files with 601 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubectl/apply/strategy/merge_conflict_test.go
View File

@@ -26,19 +26,19 @@ var _ = Describe("Comparing fields of remote and recorded ", func() {
Context("Test conflict in map fields of remote and recorded", func() {
It("If conflicts found, expected return error", func() {
recorded := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo1: "key1"
`)
local := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo2: "baz2-1"
`)
remote := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo1: "baz1-0"
@@ -53,7 +53,7 @@ spec:
Context("Test conflict in list fields of remote and recorded ", func() {
It("If conflicts found, expected return false", func() {
recorded := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
finalizers:
@@ -62,7 +62,7 @@ metadata:
- "d"
`)
local := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
finalizers:
@@ -70,7 +70,7 @@ metadata:
- "b"
`)
remote := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
finalizers:
@@ -87,7 +87,7 @@ metadata:
Context("Test conflict in Map-List fields of remote and recorded ", func() {
It("should leave the item", func() {
recorded := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template:
@@ -97,7 +97,7 @@ spec:
image: image1
`)
local := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template:
@@ -107,7 +107,7 @@ spec:
image: image2
`)
remote := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template:
@@ -125,21 +125,21 @@ spec:
Context("Test conflicts in nested map field", func() {
It("If conflicts found, expected return error", func() {
recorded := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo1:
name: "key1"
`)
local := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo1:
name: "baz1-0"
`)
remote := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
foo1:
@@ -154,7 +154,7 @@ spec:
Context("Test conflicts in complicated map, list", func() {
It("Should catch conflict in key-value in map element", func() {
recorded := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template:
@@ -170,7 +170,7 @@ spec:
hostPort: 2022
`)
local := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template:
@@ -183,7 +183,7 @@ spec:
hostPort: 2020
`)
remote := create(`
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
spec:
template: