Add Milestone Job integration tests for Helm Chart #171

sigalsax · 2020-08-02T13:15:19Z

This PR adds integration tests for the Milestone Job for the Secrets Provider

** NOTE that tests will not on Jenkins because Helm chart was not pushed.

You can run tests manually by:

You need Helm chart locally to run helm chart successfully. you can check out locally via git checkout origin/helm-chart-phase-2 -- secrets-provider
Run ./bin/start --oss --gke

abrahamko · 2020-08-02T13:32:42Z

deploy/test/test_cases/TEST_ID_17_helm_job_deploys_successfully.sh

+  sed -e "s#{{ SECRETS_PROVIDER_ROLE }}#${SECRETS_PROVIDER_ROLE:-"secrets-provider-role"}#g" \
+      -e "s#{{ SECRETS_PROVIDER_ROLE_BINDING }}#${SECRETS_PROVIDER_ROLE_BINDING:-"secrets-provider-role-binding"}#g" \
+      -e "s#{{ SERVICE_ACCOUNT_CREATE }}#${SERVICE_ACCOUNT_CREATE:-"true"}#g" \
+      -e "s#{{ SERVICE_ACCOUNT }}#${SERVICE_ACCOUNT:-"secrets-provider-service-account"}#g" \
+      -e "s#{{ K8S_SECRETS }}#${K8S_SECRETS:-"test-k8s-secret"}#g" \
+      -e "s#{{ CONJUR_ACCOUNT }}#${CONJUR_ACCOUNT:-"cucumber"}#g" \
+      -e "s#{{ CONJUR_APPLIANCE_URL }}#${CONJUR_APPLIANCE_URL:-"https://conjur-follower.${CONJUR_NAMESPACE_NAME}.svc.cluster.local/api"}#g" \
+      -e "s#{{ CONJUR_AUTHN_URL }}#${CONJUR_AUTHN_URL:-"https://conjur-follower.${CONJUR_NAMESPACE_NAME}.svc.cluster.local/api/authn-k8s/${AUTHENTICATOR_ID}"}#g" \
+      -e "s#{{ CONJUR_AUTHN_LOGIN }}# ${CONJUR_AUTHN_LOGIN:-"host/conjur/authn-k8s/${AUTHENTICATOR_ID}/apps/${APP_NAMESPACE_NAME}/*/*"}#g"  \
+      -e "s#{{ SECRETS_PROVIDER_SSL_CONFIG_MAP }}# ${SECRETS_PROVIDER_SSL_CONFIG_MAP:-"secrets-provider-ssl-config-map"}#g" \
+      "secrets-provider-chart/ci/test-values-template.yaml" > "secrets-provider-chart/ci/test-values.yaml"


This looks messy.
You can make use of envsubst, which is a GNU tool, instead of this.
See for more info: https://stackoverflow.com/a/14157575

I agree but since we are moving to BDD in the near future and this PR has been open for a while this seems less pressing.
This is part of a greater refactoring effort that could be addressed during our RD Boost days

bootstrap.env

deploy/run_with_summon.sh

deploy/test/helm-props/k8s/helm-app.yaml

deploy/test/helm-props/openshift/helm-app.yaml

Tovli

Nice work
Please go over the .sh files and ask yourself - if it was written in any other language, would I keep the code as it is now? would it pass your code review if it was ruby/js/go?

orenbm · 2020-08-04T09:40:00Z

deploy/test/helm-props/k8s_secrets_two.yml

+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-k8s-secret-two


@sigalsax what's the purpose of this k8s secret? can't we use the one that we already have?

eladkug · 2020-08-05T10:05:59Z

deploy/test/test_cases/TEST_ID_17_helm_job_deploys_successfully.sh

+  verify_secret_value_in_pod $pod_name "TEST_SECRET" "supersecret"
+}
+
+function deploy_chart {


I prefer not having function in the test it self. We can use those functions in other tests as well now or in the future.
For example you always run fill_helm_chart and helm install maybe with different parameters but i prefer this file will be clean.
Moving from clean files to BDD in the future will be easier as well.

- Adds integration tests as detailed in [solution design](https://github.com/cyberark/secrets-provider-for-k8s/blob/master/design/milestone_1_2_design_doc.md) - Adds helper utils needed to build K8s resource and Helm charts integration-tests-job-milestone (#171)

- Adds ability to deploy the Secrets Provider via Helm for development environment - Updates reload script to support Helm flow - Adds cleanup of Helm charts between runs - Adds documentation on how to deploy with Helm

- Adds props for Helm tests including create Conjur and K8s/Openshift resources for test use - Adds ci folder for overriding Helm chart defaults dynamically

- Adds integration tests as detailed in [solution design](https://github.com/cyberark/secrets-provider-for-k8s/blob/master/design/milestone_1_2_design_doc.md) - Adds helper utils needed to build K8s resource and Helm charts integration-tests-job-milestone (#171)

eladkug · 2020-08-19T11:21:33Z

deploy/test/test_cases/TEST_ID_25_helm_default_retry_successful.sh

+if (( $duration >= $retryIntervalMin && $duration <= $retryIntervalMax )); then
+  echo 0
+else
+  echo 1


We need to add here the times in logs. If we will fail we need to understand the reason.

codeclimate · 2020-08-19T14:08:23Z

Code Climate has analyzed commit 7444d4e and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 86.6% (0.0% change).

View more on Code Climate.

eladkug

LGTM from test perspective

.

sigalsax self-assigned this Aug 2, 2020

sigalsax marked this pull request as draft August 2, 2020 13:15

sigalsax force-pushed the integration-tests-job-milestone branch 2 times, most recently from 8419795 to da7ffc1 Compare August 2, 2020 13:19

abrahamko reviewed Aug 2, 2020

View reviewed changes

sigalsax force-pushed the integration-tests-job-milestone branch 3 times, most recently from 0f7dcb1 to e530601 Compare August 3, 2020 13:27

Tovli reviewed Aug 4, 2020

View reviewed changes

bootstrap.env Outdated Show resolved Hide resolved

Tovli reviewed Aug 4, 2020

View reviewed changes

deploy/run_with_summon.sh Outdated Show resolved Hide resolved

Tovli reviewed Aug 4, 2020

View reviewed changes

deploy/test/helm-props/k8s/helm-app.yaml Outdated Show resolved Hide resolved

Tovli reviewed Aug 4, 2020

View reviewed changes

deploy/test/helm-props/openshift/helm-app.yaml Outdated Show resolved Hide resolved

Tovli previously requested changes Aug 4, 2020

View reviewed changes

sigalsax force-pushed the integration-tests-job-milestone branch 2 times, most recently from 31b5d7b to 0d25e50 Compare August 4, 2020 07:56

sigalsax requested a review from orenbm August 4, 2020 08:03

orenbm reviewed Aug 4, 2020

View reviewed changes

sigalsax force-pushed the integration-tests-job-milestone branch 4 times, most recently from 05e6d11 to 2b148ea Compare August 5, 2020 08:00

sigalsax requested a review from orenbm August 5, 2020 08:00

sigalsax marked this pull request as ready for review August 5, 2020 08:01

sigalsax force-pushed the integration-tests-job-milestone branch from 2b148ea to e45e7e9 Compare August 5, 2020 08:02

eladkug reviewed Aug 5, 2020

View reviewed changes

sigalsax force-pushed the integration-tests-job-milestone branch 5 times, most recently from 65170a5 to b3b4036 Compare August 9, 2020 04:39

sigalsax requested a review from eladkug August 19, 2020 05:32

sigalsax force-pushed the integration-tests-job-milestone branch from 3d2c675 to 15d208d Compare August 19, 2020 05:40

sigalsax added 2 commits August 19, 2020 10:36

Add Helm deployment to dev environment and document instructions

4f0baa1

- Adds ability to deploy the Secrets Provider via Helm for development environment - Updates reload script to support Helm flow - Adds cleanup of Helm charts between runs - Adds documentation on how to deploy with Helm

Add Helm prop for test setup

a971a60

- Adds props for Helm tests including create Conjur and K8s/Openshift resources for test use - Adds ci folder for overriding Helm chart defaults dynamically

sigalsax force-pushed the integration-tests-job-milestone branch 5 times, most recently from 7dcb1c8 to 5490d28 Compare August 19, 2020 09:15

sigalsax added 2 commits August 19, 2020 12:21

Remove OC OSS temporarily to allow for successful build

9e147b5

sigalsax force-pushed the integration-tests-job-milestone branch 3 times, most recently from 8cc4ddf to d35a65c Compare August 19, 2020 09:37

eladkug reviewed Aug 19, 2020

View reviewed changes

sigalsax force-pushed the integration-tests-job-milestone branch 3 times, most recently from 884c2ca to 39db4c6 Compare August 19, 2020 12:32

Add bc to support ability mathematic operations on floats

7444d4e

sigalsax force-pushed the integration-tests-job-milestone branch from 39db4c6 to 7444d4e Compare August 19, 2020 14:01

eladkug self-requested a review August 19, 2020 14:49

eladkug approved these changes Aug 19, 2020

View reviewed changes

sigalsax merged commit b0c20c3 into master Aug 20, 2020

sigalsax deleted the integration-tests-job-milestone branch August 20, 2020 05:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Milestone Job integration tests for Helm Chart #171

Add Milestone Job integration tests for Helm Chart #171

sigalsax commented Aug 2, 2020 •

edited

Loading

abrahamko Aug 2, 2020

sigalsax Aug 19, 2020

Tovli left a comment

orenbm Aug 4, 2020

eladkug Aug 5, 2020

eladkug Aug 19, 2020

codeclimate bot commented Aug 19, 2020

eladkug left a comment

Add Milestone Job integration tests for Helm Chart #171

Add Milestone Job integration tests for Helm Chart #171

Conversation

sigalsax commented Aug 2, 2020 • edited Loading

abrahamko Aug 2, 2020

Choose a reason for hiding this comment

sigalsax Aug 19, 2020

Choose a reason for hiding this comment

Tovli left a comment

Choose a reason for hiding this comment

orenbm Aug 4, 2020

Choose a reason for hiding this comment

eladkug Aug 5, 2020

Choose a reason for hiding this comment

eladkug Aug 19, 2020

Choose a reason for hiding this comment

codeclimate bot commented Aug 19, 2020

eladkug left a comment

Choose a reason for hiding this comment

sigalsax commented Aug 2, 2020 •

edited

Loading