Switch to kuttl.dev/v1beta. Deprecated support for kudo.dev (#119)

Signed-off-by: Ken Sipe <kensipe@gmail.com>

config/basic-kuttl-test.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 parallel: 4
 timeout: 120

pkg/apis/testharness/v1beta1/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 // Package v1beta1 contains API Schema definitions for the testharness API group
 // +k8s:openapi-gen=false
 // +k8s:deepcopy-gen=package
-// +groupName=kudo.dev
+// +groupName=kuttl.dev
 // +kubebuilder:skip
 package v1beta1

pkg/apis/testharness/v1beta1/test_types.go

@@ -9,7 +9,7 @@ import (
 
 // TestSuite configures which tests should be loaded.
 type TestSuite struct {
-	// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestSuite.
+	// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestSuite or kuttl.dev/v1beta1/TestSuite.
 	metav1.TypeMeta `json:",inline"`
 	// Set labels or the test suite name.
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -56,7 +56,7 @@ type TestSuite struct {
 
 // TestStep settings to apply to a test step.go
 type TestStep struct {
-	// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestStep.
+	// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestStep or kuttl.dev/v1beta1/TestStep.
 	metav1.TypeMeta `json:",inline"`
 	// Override the default metadata. Set labels or override the test step name.
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -88,7 +88,7 @@ type TestStep struct {
 
 // TestAssert represents the settings needed to verify the result of a test step.
 type TestAssert struct {
-	// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestAssert.
+	// The type meta object, should always be a GVK of  kudo.dev/v1beta1/TestAssert or kuttl.dev/v1beta1/TestAssert.
 	metav1.TypeMeta `json:",inline"`
 	// Override the default timeout of 30 seconds (in seconds).
 	Timeout int `json:"timeout"`

pkg/test/case_test.go

@@ -32,7 +32,7 @@ func TestLoadTestSteps(t *testing.T) {
 						},
 						TypeMeta: metav1.TypeMeta{
 							Kind:       "TestStep",
-							APIVersion: "kudo.dev/v1beta1",
+							APIVersion: "kuttl.dev/v1beta1",
 						},
 						Index: 0,
 					},
@@ -60,7 +60,7 @@ func TestLoadTestSteps(t *testing.T) {
 					Step: &harness.TestStep{
 						TypeMeta: metav1.TypeMeta{
 							Kind:       "TestStep",
-							APIVersion: "kudo.dev/v1beta1",
+							APIVersion: "kuttl.dev/v1beta1",
 						},
 						Index: 1,
 						Delete: []harness.ObjectReference{
@@ -76,7 +76,7 @@ func TestLoadTestSteps(t *testing.T) {
 					Assert: &harness.TestAssert{
 						TypeMeta: metav1.TypeMeta{
 							Kind:       "TestAssert",
-							APIVersion: "kudo.dev/v1beta1",
+							APIVersion: "kuttl.dev/v1beta1",
 						},
 						Timeout: 20,
 					},
@@ -135,7 +135,7 @@ func TestLoadTestSteps(t *testing.T) {
 						},
 						TypeMeta: metav1.TypeMeta{
 							Kind:       "TestStep",
-							APIVersion: "kudo.dev/v1beta1",
+							APIVersion: "kuttl.dev/v1beta1",
 						},
 						Index: 3,
 					},

pkg/test/step_integration_test_data/two_step/00-step1.yaml

@@ -1,3 +1,3 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 30

pkg/test/step_integration_test_data/two_step/00-step2.yaml

@@ -1,3 +1,3 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 30

pkg/test/step_integration_test_data/two_step/01-step1.yaml

@@ -1,8 +1,8 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 30
 
 ----
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 30

pkg/test/test_data/cli-test/00-create-pod.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - command: kubectl apply -f ./test_data/pod.yaml

pkg/test/test_data/cli-test/01-patch.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
 - command: kubectl label pod cli-test-pod test=true

pkg/test/test_data/delete-in-step/01-create.yaml

@@ -1,6 +1,6 @@
 # Delete all pods and then make sure that we can make pods with the same name but different specs (this would fail if they were
 # not deleted).
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 delete:
 - apiVersion: v1

pkg/test/test_data/deprecate-test/00-assert.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: cli-test-pod

pkg/test/test_data/deprecate-test/00-create-pod.yaml

@@ -0,0 +1,5 @@
+apiVersion: kudo.dev/v1beta1
+kind: TestStep
+commands:
+  - command: kubectl apply -f ./test_data/pod.yaml
+    namespaced: true

pkg/test/test_data/deprecate-test/01-assert.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: cli-test-pod
+  labels:
+    test: "true"

pkg/test/test_data/deprecate-test/01-patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: kudo.dev/v1beta1
+kind: TestStep
+commands:
+- command: kubectl label pod cli-test-pod test=true
+  namespaced: true
+- command: kubectl command is bad
+  ignoreFailure: true

pkg/test/test_data/deprecate-test/README.md

@@ -0,0 +1,3 @@
+This directory exists to test that the original group "kudo.dev/v1beta1" works for `apiVersion`
+This deprecation started after release `v0.3.0`.  After `v0.5.0` this group is subjected to be removed and this test 
+folder and test should be removed.

pkg/test/test_data/deprecate-test/test_data/pod.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: cli-test-pod
+spec:
+  containers:
+  - name: cli-test
+    image: alpine
+  restartPolicy: Never

pkg/test/test_data/teststep-apply/00-create.yaml

@@ -1,5 +1,5 @@
 # using apply from TestStep from multiple folder locations
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 apply:
   - hello.yaml

pkg/test/test_data/teststep-assert/00-create.yaml

@@ -17,7 +17,7 @@ spec:
       name: test
 ---
 # using assert from TestStep from multiple folder locations
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 assert:
   - hello1-assert.yaml

pkg/test/test_data/teststep-errors/01-delete-error-check.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 delete:
   - apiVersion: v1

pkg/test/test_data/with-overrides/00-test-step.yaml

@@ -8,7 +8,7 @@ spec:
   - name: nginx
     image: nginx:1.7.9
 ---
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 metadata:
   name: with-test-step-name-override

pkg/test/test_data/with-overrides/01-assert.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 20
 ---

pkg/test/test_data/with-overrides/01-test-assert.yaml

@@ -8,7 +8,7 @@ spec:
   - name: nginx
     image: nginx:1.7.9
 ---
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 delete:
 - apiVersion: v1

pkg/test/test_data/with-overrides/03-pod.yaml

@@ -1,4 +1,4 @@
-apiVersion: kudo.dev/v1beta1
+apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 metadata:
   name: name-overridden

pkg/test/utils/kubernetes.go

@@ -369,12 +369,14 @@ func ConvertUnstructured(in runtime.Object) (runtime.Object, error) {
 	kind := in.GetObjectKind().GroupVersionKind().Kind
 	group := in.GetObjectKind().GroupVersionKind().Group
 
+	// Deprecated: kudo.dev is deprecated.
 	kudoGroup := "kudo.dev"
-	if group == kudoGroup && kind == "TestStep" {
+	kuttlGroup := "kuttl.dev"
+	if (group == kudoGroup || group == kuttlGroup) && kind == "TestStep" {
 		converted = &harness.TestStep{}
-	} else if group == kudoGroup && kind == "TestAssert" {
+	} else if (group == kudoGroup || group == kuttlGroup) && kind == "TestAssert" {
 		converted = &harness.TestAssert{}
-	} else if group == kudoGroup && kind == "TestSuite" {
+	} else if (group == kudoGroup || group == kuttlGroup) && kind == "TestSuite" {
 		converted = &harness.TestSuite{}
 	} else {
 		return in, nil