From 38f96ea676b972af42edb2fffe672739a47f54fd Mon Sep 17 00:00:00 2001 From: Melissa Lee Date: Mon, 27 Jun 2022 10:01:27 -0400 Subject: [PATCH 1/2] Add tests for env/envFrom tests --- .../tests/scorecard/kuttl/env/00-assert.yaml | 16 ++++++++ .../kuttl/env/00-configmap-secret.yaml | 13 +++++++ .../tests/scorecard/kuttl/env/01-assert.yaml | 37 +++++++++++++++++++ .../scorecard/kuttl/env/01-runtime-env.yaml | 25 +++++++++++++ .../tests/scorecard/kuttl/env/02-assert.yaml | 12 ++++++ .../tests/scorecard/kuttl/env/02-errors.yaml | 26 +++++++++++++ .../kuttl/env/02-runtime-delete-env.yaml | 8 ++++ .../tests/scorecard/kuttl/env/03-assert.yaml | 37 +++++++++++++++++++ .../kuttl/env/03-runtime-statefulset-env.yaml | 26 +++++++++++++ .../tests/scorecard/kuttl/env/04-assert.yaml | 12 ++++++ .../tests/scorecard/kuttl/env/04-errors.yaml | 26 +++++++++++++ .../04-runtime-statefulset-delete-env.yaml | 8 ++++ .../tests/scorecard/kuttl/env/05-delete.yaml | 13 +++++++ 13 files changed, 259 insertions(+) create mode 100644 bundle/tests/scorecard/kuttl/env/00-assert.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/00-configmap-secret.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/01-assert.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/02-assert.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/02-errors.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/02-runtime-delete-env.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/03-assert.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/04-assert.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/04-errors.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/04-runtime-statefulset-delete-env.yaml create mode 100644 bundle/tests/scorecard/kuttl/env/05-delete.yaml diff --git a/bundle/tests/scorecard/kuttl/env/00-assert.yaml b/bundle/tests/scorecard/kuttl/env/00-assert.yaml new file mode 100644 index 000000000..7d2a6266e --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/00-assert.yaml @@ -0,0 +1,16 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 60 +--- +kind: ConfigMap +apiVersion: v1 +metadata: + name: env-rc-configmap +--- +apiVersion: v1 +kind: Secret +metadata: + name: env-rc-secret +type: Opaque +data: + adminPassword: Passw0rd \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/00-configmap-secret.yaml b/bundle/tests/scorecard/kuttl/env/00-configmap-secret.yaml new file mode 100644 index 000000000..be5610b01 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/00-configmap-secret.yaml @@ -0,0 +1,13 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: env-rc-configmap +--- +apiVersion: v1 +kind: Secret +metadata: + name: env-rc-secret +type: Opaque +data: + # 'Test password' + adminPassword: Passw0rd \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/01-assert.yaml b/bundle/tests/scorecard/kuttl/env/01-assert.yaml new file mode 100644 index 000000000..365d911f1 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/01-assert.yaml @@ -0,0 +1,37 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 60 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: env-rc +spec: + template: + spec: + containers: + - env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + - name: TLS_DIR + - name: SA_RESOURCE_VERSION + - name: SERVICE_CERT_SECRET_RESOURCE_VERSION + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret +status: + replicas: 1 + readyReplicas: 1 + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml b/bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml new file mode 100644 index 000000000..1803ac5ce --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml @@ -0,0 +1,25 @@ +apiVersion: rc.app.stacks/v1beta2 +kind: RuntimeComponent +metadata: + name: env-rc +spec: + # Add fields here + applicationImage: navidsh/demo-day + replicas: 1 + env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/02-assert.yaml b/bundle/tests/scorecard/kuttl/env/02-assert.yaml new file mode 100644 index 000000000..692a96149 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/02-assert.yaml @@ -0,0 +1,12 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 60 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: env-rc +status: + replicas: 1 + readyReplicas: 1 + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/env/02-errors.yaml b/bundle/tests/scorecard/kuttl/env/02-errors.yaml new file mode 100644 index 000000000..d0409a797 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/02-errors.yaml @@ -0,0 +1,26 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: env-rc +spec: + template: + spec: + containers: + - env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/02-runtime-delete-env.yaml b/bundle/tests/scorecard/kuttl/env/02-runtime-delete-env.yaml new file mode 100644 index 000000000..dadb82df1 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/02-runtime-delete-env.yaml @@ -0,0 +1,8 @@ +apiVersion: rc.app.stacks/v1beta2 +kind: RuntimeComponent +metadata: + name: env-rc +spec: + # Add fields here + env: + envFrom: \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/03-assert.yaml b/bundle/tests/scorecard/kuttl/env/03-assert.yaml new file mode 100644 index 000000000..42485569b --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/03-assert.yaml @@ -0,0 +1,37 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 60 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: env-rc +spec: + template: + spec: + containers: + - env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + - name: TLS_DIR + - name: SA_RESOURCE_VERSION + - name: SERVICE_CERT_SECRET_RESOURCE_VERSION + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret +status: + replicas: 1 + readyReplicas: 1 + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml b/bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml new file mode 100644 index 000000000..c9efc0985 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml @@ -0,0 +1,26 @@ +apiVersion: rc.app.stacks/v1beta2 +kind: RuntimeComponent +metadata: + name: env-rc +spec: + # Add fields here + applicationImage: navidsh/demo-day + replicas: 1 + statefulSet: {} + env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/04-assert.yaml b/bundle/tests/scorecard/kuttl/env/04-assert.yaml new file mode 100644 index 000000000..e08db31bd --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/04-assert.yaml @@ -0,0 +1,12 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 60 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: env-rc +status: + replicas: 1 + readyReplicas: 1 + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/env/04-errors.yaml b/bundle/tests/scorecard/kuttl/env/04-errors.yaml new file mode 100644 index 000000000..a073fd465 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/04-errors.yaml @@ -0,0 +1,26 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: env-rc +spec: + template: + spec: + containers: + - env: + - name: TEST_VALUE + value: test-value + - name: TEST_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.name + - name: TEST_CPU_REQUEST + valueFrom: + resourceFieldRef: + containerName: app + resource: requests.cpu + envFrom: + - configMapRef: + name: env-rc-configmap + - secretRef: + name: env-rc-secret \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/04-runtime-statefulset-delete-env.yaml b/bundle/tests/scorecard/kuttl/env/04-runtime-statefulset-delete-env.yaml new file mode 100644 index 000000000..dadb82df1 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/04-runtime-statefulset-delete-env.yaml @@ -0,0 +1,8 @@ +apiVersion: rc.app.stacks/v1beta2 +kind: RuntimeComponent +metadata: + name: env-rc +spec: + # Add fields here + env: + envFrom: \ No newline at end of file diff --git a/bundle/tests/scorecard/kuttl/env/05-delete.yaml b/bundle/tests/scorecard/kuttl/env/05-delete.yaml new file mode 100644 index 000000000..99c860285 --- /dev/null +++ b/bundle/tests/scorecard/kuttl/env/05-delete.yaml @@ -0,0 +1,13 @@ +# Need to manually delete resources as kuttl does not automatically delete these at the end of the test +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +delete: +- apiVersion: v1 + kind: ConfigMap + name: env-rc-configmap +- apiVersion: v1 + kind: Secret + name: env-rc-secret +- apiVersion: rc.app.stacks/v1beta2 + kind: RuntimeComponent + name: env-rc \ No newline at end of file From d309813539834ecc8f60e0e7de1a05f7b2444de5 Mon Sep 17 00:00:00 2001 From: Melissa Lee Date: Mon, 27 Jun 2022 12:16:32 -0400 Subject: [PATCH 2/2] Add configmaps rules to service account --- config/rbac/kuttl-rbac.yaml | 1 + config/rbac/minikube-kuttl-rbac.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rbac/kuttl-rbac.yaml b/config/rbac/kuttl-rbac.yaml index b5ce50ae0..b315c91cc 100644 --- a/config/rbac/kuttl-rbac.yaml +++ b/config/rbac/kuttl-rbac.yaml @@ -26,6 +26,7 @@ rules: - secrets - serviceaccounts - persistentvolumeclaims + - configmaps verbs: - get - list diff --git a/config/rbac/minikube-kuttl-rbac.yaml b/config/rbac/minikube-kuttl-rbac.yaml index 5f9545ece..09a5fd464 100644 --- a/config/rbac/minikube-kuttl-rbac.yaml +++ b/config/rbac/minikube-kuttl-rbac.yaml @@ -26,6 +26,7 @@ rules: - secrets - serviceaccounts - persistentvolumeclaims + - configmaps verbs: - get - list