From 5781f0e8ad8cd1b407fdd15f0712c98fd536bb44 Mon Sep 17 00:00:00 2001 From: Amitk3293 Date: Tue, 23 Aug 2022 12:49:54 +0200 Subject: [PATCH 1/3] adding e2e tests using kuttle --- kuttl-test.yaml | 5 +++++ tests/e2e/crd-test/00-assert.yaml | 12 ++++++++++++ tests/e2e/create-deployment/00-assert.yaml | 7 +++++++ tests/e2e/namespace-status/00-assert.yaml | 6 ++++++ tests/e2e/pod-status/00-assert.yaml | 6 ++++++ 5 files changed, 36 insertions(+) create mode 100644 kuttl-test.yaml create mode 100644 tests/e2e/crd-test/00-assert.yaml create mode 100644 tests/e2e/create-deployment/00-assert.yaml create mode 100644 tests/e2e/namespace-status/00-assert.yaml create mode 100644 tests/e2e/pod-status/00-assert.yaml diff --git a/kuttl-test.yaml b/kuttl-test.yaml new file mode 100644 index 0000000..cfc7b01 --- /dev/null +++ b/kuttl-test.yaml @@ -0,0 +1,5 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestSuite +testDirs: +- ./tests/e2e/ +timeout: 180 \ No newline at end of file diff --git a/tests/e2e/crd-test/00-assert.yaml b/tests/e2e/crd-test/00-assert.yaml new file mode 100644 index 0000000..a05b9fa --- /dev/null +++ b/tests/e2e/crd-test/00-assert.yaml @@ -0,0 +1,12 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: resourcemanagers.resource-management.tikalk.com +status: + acceptedNames: + plural: resourcemanagers + singular: resourcemanager + kind: ResourceManager + listKind: ResourceManagerList + storedVersions: + - v1alpha1 diff --git a/tests/e2e/create-deployment/00-assert.yaml b/tests/e2e/create-deployment/00-assert.yaml new file mode 100644 index 0000000..0621288 --- /dev/null +++ b/tests/e2e/create-deployment/00-assert.yaml @@ -0,0 +1,7 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: resource-manager-controller-manager + namespace: resource-manager-system +status: + readyReplicas: 1 \ No newline at end of file diff --git a/tests/e2e/namespace-status/00-assert.yaml b/tests/e2e/namespace-status/00-assert.yaml new file mode 100644 index 0000000..f3219b9 --- /dev/null +++ b/tests/e2e/namespace-status/00-assert.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: resource-manager-system +status: + phase: Active \ No newline at end of file diff --git a/tests/e2e/pod-status/00-assert.yaml b/tests/e2e/pod-status/00-assert.yaml new file mode 100644 index 0000000..531f485 --- /dev/null +++ b/tests/e2e/pod-status/00-assert.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Pod +metadata: + namespace: resource-manager-system +status: + phase: Running \ No newline at end of file From 7695d5fc58441db28db59df281ce3413d04cedbb Mon Sep 17 00:00:00 2001 From: Amitk3293 Date: Wed, 24 Aug 2022 11:22:04 +0200 Subject: [PATCH 2/3] adding deployment test to diff namespace --- kubeconfig | 17 +++++++++++++++ kuttl-test.yaml | 4 +++- .../00-assert.yaml | 2 +- .../create-deployment-in-test-ns/00-test.yaml | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 kubeconfig rename tests/e2e/{create-deployment => create-deployment-in-test-ns}/00-assert.yaml (75%) create mode 100644 tests/e2e/create-deployment-in-test-ns/00-test.yaml diff --git a/kubeconfig b/kubeconfig new file mode 100644 index 0000000..ef033be --- /dev/null +++ b/kubeconfig @@ -0,0 +1,17 @@ +clusters: +- cluster: + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUyTlRrMk1qQXpOalV3SGhjTk1qSXdPREEwTVRNek9USTFXaGNOTXpJd09EQXhNVE16T1RJMQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUyTlRrMk1qQXpOalV3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUbjVTNHFzRGRjWE0yNUtsaGlvOEVaVkNEWVY0RitBSmdMdU1ocUJ1MU0KYWFHRGxJTEl5d0ZUa09sak52UzU1N2IrK1p1Tm1ydlRnSmRxTkRoRU9GdlZvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVUdTY0pBa0hQK2R6VFViOEQ5TGZoCkRscXRyTm93Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUs2c2wxdGlPYWd5WlFqWEx3azRnMDgxSms1Vm1tSEcKazQwbkJ2T3B2bGg4QWlFQStITTdNdTc0a0VlNWhXNTUxbXRCZTNqdks3S1NmbHpJM1dJNHgxMll5QTQ9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + server: https://0.0.0.0:41975 + name: cluster +contexts: +- context: + cluster: cluster + user: user + name: cluster +current-context: cluster +preferences: {} +users: +- name: user + user: + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJVzBiOUN0U3I4Sll3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOalU1TmpJd016WTFNQjRYRFRJeU1EZ3dOREV6TXpreU5Wb1hEVEl6TURndwpOREV6TXpreU5Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJELzdoUnJVKzhBRWVSOUQKSGcyLzZERU52UjUyUXZCQkhnbU9lNVpuRnBhSHFKVGFhVjI1NXNiMkdrbmg4UnorZ1Z0ckoyOGVxSXpnbzM5QwpOMFkvaFlhalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUUpPQWIwd3psNGNJdi9zVTRHSS8xL0w4ZTdaVEFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQXdNVjlSUWZzd28zbzR0MUU1US9oMVlZZ0pLRGNrSmdPcUFidHV5RUMrT0VDSVFDd3dGbEtNdVYyQ09FagpETngyaURiTVFxSCtpekxTTVl0UVdMdHM2NUowVkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZHpDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFMk5UazJNakF6TmpVd0hoY05Nakl3T0RBME1UTXpPVEkxV2hjTk16SXdPREF4TVRNek9USTEKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFMk5UazJNakF6TmpVd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUWNkYWNTRTlJNnJuaTZLZ2VRV1lQOEx0WURnV0h2ZDRyRW5ab2owTHNKClpzNTl6SWFmMnEvd1VNbWp2STZIK3hjLy9pakgvSi82MWxRbEt0NkRLdUhkbzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVDVGdHOU1NNWVIQ0wvN0ZPQmlQOQpmeS9IdTJVd0NnWUlLb1pJemowRUF3SURTQUF3UlFJZ0RCUzdVVHgzcDdFYjB2elBQU0loaXZkbzZlb2hkL1N0CjMreWYvajRwUS9NQ0lRRFRKb3NZbkN5dEZOTTlYbWhDOWZWY2tweEF0QlAxZEdmdnJEUm9xL0cyQ2c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUN0RnpyeUJXQlZjNlVPWWFkblBGZ1RidHJ4Zll0OXRhVmsyd0JOOWYvSFBvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFUC91Rkd0VDd3QVI1SDBNZURiL29NUTI5SG5aQzhFRWVDWTU3bG1jV2xvZW9sTnBwWGJubQp4dllhU2VIeEhQNkJXMnNuYng2b2pPQ2pmMEkzUmorRmhnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= diff --git a/kuttl-test.yaml b/kuttl-test.yaml index cfc7b01..c2463af 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -2,4 +2,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - ./tests/e2e/ -timeout: 180 \ No newline at end of file +timeout: 180 +commands: + - command: kubectl wait --for=condition=ready --timeout=120s pod -l control-plane=controller-manager -n resource-manager-system \ No newline at end of file diff --git a/tests/e2e/create-deployment/00-assert.yaml b/tests/e2e/create-deployment-in-test-ns/00-assert.yaml similarity index 75% rename from tests/e2e/create-deployment/00-assert.yaml rename to tests/e2e/create-deployment-in-test-ns/00-assert.yaml index 0621288..7d33904 100644 --- a/tests/e2e/create-deployment/00-assert.yaml +++ b/tests/e2e/create-deployment-in-test-ns/00-assert.yaml @@ -2,6 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: resource-manager-controller-manager - namespace: resource-manager-system + # namespace: resource-manager-system status: readyReplicas: 1 \ No newline at end of file diff --git a/tests/e2e/create-deployment-in-test-ns/00-test.yaml b/tests/e2e/create-deployment-in-test-ns/00-test.yaml new file mode 100644 index 0000000..224d4fb --- /dev/null +++ b/tests/e2e/create-deployment-in-test-ns/00-test.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: resource-manager-controller-manager + # namespace: resource-manager-system +spec: + replicas: 1 + selector: + matchLabels: + control-plane: controller-manager + template: + metadata: + creationTimestamp: null + labels: + app.kubernetes.io/managed-by: tilt + control-plane: controller-manager + tilt.dev/pod-template-hash: f8e210a1f1e86600dcad + spec: + containers: + - name: manager + image: k3d-local-k8s-reg:5000/controller:tilt-f86ed2c112b2af3e \ No newline at end of file From 1eda534226ef435b610018398a4ee614a47582f1 Mon Sep 17 00:00:00 2001 From: Amitk3293 Date: Wed, 24 Aug 2022 11:48:21 +0200 Subject: [PATCH 3/3] delete kubeconfig --- kubeconfig | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 kubeconfig diff --git a/kubeconfig b/kubeconfig deleted file mode 100644 index ef033be..0000000 --- a/kubeconfig +++ /dev/null @@ -1,17 +0,0 @@ -clusters: -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUyTlRrMk1qQXpOalV3SGhjTk1qSXdPREEwTVRNek9USTFXaGNOTXpJd09EQXhNVE16T1RJMQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUyTlRrMk1qQXpOalV3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUbjVTNHFzRGRjWE0yNUtsaGlvOEVaVkNEWVY0RitBSmdMdU1ocUJ1MU0KYWFHRGxJTEl5d0ZUa09sak52UzU1N2IrK1p1Tm1ydlRnSmRxTkRoRU9GdlZvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVUdTY0pBa0hQK2R6VFViOEQ5TGZoCkRscXRyTm93Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUs2c2wxdGlPYWd5WlFqWEx3azRnMDgxSms1Vm1tSEcKazQwbkJ2T3B2bGg4QWlFQStITTdNdTc0a0VlNWhXNTUxbXRCZTNqdks3S1NmbHpJM1dJNHgxMll5QTQ9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - server: https://0.0.0.0:41975 - name: cluster -contexts: -- context: - cluster: cluster - user: user - name: cluster -current-context: cluster -preferences: {} -users: -- name: user - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJVzBiOUN0U3I4Sll3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOalU1TmpJd016WTFNQjRYRFRJeU1EZ3dOREV6TXpreU5Wb1hEVEl6TURndwpOREV6TXpreU5Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJELzdoUnJVKzhBRWVSOUQKSGcyLzZERU52UjUyUXZCQkhnbU9lNVpuRnBhSHFKVGFhVjI1NXNiMkdrbmg4UnorZ1Z0ckoyOGVxSXpnbzM5QwpOMFkvaFlhalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUUpPQWIwd3psNGNJdi9zVTRHSS8xL0w4ZTdaVEFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQXdNVjlSUWZzd28zbzR0MUU1US9oMVlZZ0pLRGNrSmdPcUFidHV5RUMrT0VDSVFDd3dGbEtNdVYyQ09FagpETngyaURiTVFxSCtpekxTTVl0UVdMdHM2NUowVkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZHpDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFMk5UazJNakF6TmpVd0hoY05Nakl3T0RBME1UTXpPVEkxV2hjTk16SXdPREF4TVRNek9USTEKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFMk5UazJNakF6TmpVd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUWNkYWNTRTlJNnJuaTZLZ2VRV1lQOEx0WURnV0h2ZDRyRW5ab2owTHNKClpzNTl6SWFmMnEvd1VNbWp2STZIK3hjLy9pakgvSi82MWxRbEt0NkRLdUhkbzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVDVGdHOU1NNWVIQ0wvN0ZPQmlQOQpmeS9IdTJVd0NnWUlLb1pJemowRUF3SURTQUF3UlFJZ0RCUzdVVHgzcDdFYjB2elBQU0loaXZkbzZlb2hkL1N0CjMreWYvajRwUS9NQ0lRRFRKb3NZbkN5dEZOTTlYbWhDOWZWY2tweEF0QlAxZEdmdnJEUm9xL0cyQ2c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUN0RnpyeUJXQlZjNlVPWWFkblBGZ1RidHJ4Zll0OXRhVmsyd0JOOWYvSFBvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFUC91Rkd0VDd3QVI1SDBNZURiL29NUTI5SG5aQzhFRWVDWTU3bG1jV2xvZW9sTnBwWGJubQp4dllhU2VIeEhQNkJXMnNuYng2b2pPQ2pmMEkzUmorRmhnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=