From bbeef23c4508746d64b42b7febcfdae3c35356c3 Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 3 Dec 2018 09:29:38 -0500 Subject: [PATCH] test testing build --- .circleci/config.yml | 26 +++++++++++++++++++-- deploy/kubernetes/atst-deployer.yml | 3 +++ deploy/kubernetes/atst-update-deploy.sh | 2 +- deploy/kubernetes/test/atat-deploy-role.yml | 18 ++++++++++++++ 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 deploy/kubernetes/test/atat-deploy-role.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 43ecbd83..cb4fca41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -204,6 +204,12 @@ jobs: steps: - attach_workspace: at: . + - run: + name: "Export GIT_SHA" + command: echo "export GIT_SHA=$(git rev-parse --short HEAD)" >> $BASH_ENV + - run: + name: "Generate the Target Image Name" + command: echo "export IMAGE_NAME=\"${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${GIT_SHA}\"" >> $BASH_ENV - run: name: "Update Kubernetes Deployment" command: ./deploy/kubernetes/atst-update-deploy.sh atat-test @@ -231,15 +237,31 @@ workflows: nightly: triggers: - schedule: - cron: "0 0 * * *" + cron: "37 * * * *" + # cron: "0 0 * * *" filters: branches: only: - master + - test-env jobs: + - app_setup + - test: + requires: + - app_setup + - build_and_push_image: + requires: + - test + filters: + branches: + only: + - master + - test-env - deploy_test: requires: - build_and_push_image filters: branches: - only: master + only: + - master + - test-env diff --git a/deploy/kubernetes/atst-deployer.yml b/deploy/kubernetes/atst-deployer.yml index ed7950d9..77d94a1b 100644 --- a/deploy/kubernetes/atst-deployer.yml +++ b/deploy/kubernetes/atst-deployer.yml @@ -32,6 +32,9 @@ subjects: - kind: ServiceAccount name: atat-deployer namespace: atat +- kind: ServiceAccount + name: atat-deployer + namespace: atat-test roleRef: kind: Role name: atat-deploy-role diff --git a/deploy/kubernetes/atst-update-deploy.sh b/deploy/kubernetes/atst-update-deploy.sh index ed4ce0ce..d9ade43e 100755 --- a/deploy/kubernetes/atst-update-deploy.sh +++ b/deploy/kubernetes/atst-update-deploy.sh @@ -37,7 +37,7 @@ echo "${K8S_CA_CRT}" | base64 -d - > "${HOME}/k8s_ca.crt" kubectl config set-context atst-deployer \ --cluster=atat-cluster \ --user=atat-deployer \ - --namespace=atat + --namespace=${NAMESPACE} kubectl config set-cluster atat-cluster \ --embed-certs=true \ diff --git a/deploy/kubernetes/test/atat-deploy-role.yml b/deploy/kubernetes/test/atat-deploy-role.yml new file mode 100644 index 00000000..2e2ee7c4 --- /dev/null +++ b/deploy/kubernetes/test/atat-deploy-role.yml @@ -0,0 +1,18 @@ +kind: Role +apiVersion: rbac.authorization.k8s.io/v1beta1 +metadata: + namespace: atat-test + name: atat-deploy-role +rules: +- apiGroups: ["extensions", "apps"] + resources: ["deployments"] + verbs: ["get", "watch", "create", "update", "patch"] +- apiGroups: [""] + resources: ["services"] + verbs: ["get", "create", "update", "patch"] +- apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "create", "update", "patch"] +- apiGroups: ["extensions", "apps"] + resources: ["ingresses"] + verbs: ["get", "create", "update", "patch"]