diff --git a/.github/workflows/prod-run.yaml b/.github/workflows/prod-run.yaml index 99ecfcd..21e51fe 100644 --- a/.github/workflows/prod-run.yaml +++ b/.github/workflows/prod-run.yaml @@ -15,6 +15,7 @@ env: DRBKPD_KUBECONF: ${{ secrets.DRBKPD_KUBECONF }} DRBKPI_KUBECONF: ${{ secrets.DRBKPI_KUBECONF }} VO_HARBOR_ROBOT: ${{ secrets.VO_HARBOR_ROBOT }} + VO_UTIL_KUBECONF: ${{ secrets.VO_UTIL_KUBECONF }} jobs: PROD_K8S_Query: @@ -39,14 +40,15 @@ jobs: mkdir secrets touch secrets/qa-bkpi.yaml ; echo "$QBKPI_KUBECONF" > secrets/qa-bkpi.yaml touch secrets/qa-bkpd.yaml ; echo "$QBKPD_KUBECONF" > secrets/qa-bkpd.yaml - touch secrets/bkpi.yaml ; echo "$PBKPI_KUBECONF" > secrets/bkpi.yaml - touch secrets/bkpd.yaml ; echo "$PBKPD_KUBECONF" > secrets/bkpd.yaml - touch secrets/bkpidr.yaml ; echo "$DRBKPI_KUBECONF" > secrets/bkpidr.yaml - touch secrets/bkpddr.yaml ; echo "$DRBKPD_KUBECONF" > secrets/bkpddr.yaml - touch secrets/qvo-ranch.yaml ; echo "$QVO_RANCH_KUBECONF" > secrets/qvo-ranch.yaml - touch secrets/scidmz-ranch.yaml ; echo "$SCIDMZ_KUBECONF" > secrets/scidmz-ranch.yaml - touch secrets/qscidmz-ranch.yaml ; echo "$QSCIDMZ_KUBECONF" > secrets/qscidmz-ranch.yaml - touch secrets/vo-ranch.yaml ; echo "$VO_RANCH_KUBECONF" > secrets/vo-ranch.yaml + touch secrets/bkpi.yaml ; echo "$PBKPI_KUBECONF" > secrets/prod-bkpi.yaml + touch secrets/bkpd.yaml ; echo "$PBKPD_KUBECONF" > secrets/prod-bkpd.yaml + touch secrets/bkpidr.yaml ; echo "$DRBKPI_KUBECONF" > secrets/dr-bkpi.yaml + touch secrets/bkpddr.yaml ; echo "$DRBKPD_KUBECONF" > secrets/dr-bkpd.yaml + touch secrets/qvo-ranch.yaml ; echo "$QVO_RANCH_KUBECONF" > secrets/qa-voranch.yaml + touch secrets/scidmz-ranch.yaml ; echo "$SCIDMZ_KUBECONF" > secrets/prod-scidmz.yaml + touch secrets/qscidmz-ranch.yaml ; echo "$QSCIDMZ_KUBECONF" > secrets/qa-scidmz.yaml + touch secrets/vo-ranch.yaml ; echo "$VO_RANCH_KUBECONF" > secrets/prod-voranch.yaml + touch secrets/vo-ranch.yaml ; echo "$VO_UTIL_KUBECONF" > secrets/prod-voutil.yaml touch secrets/robot.prod ; echo "$VO_HARBOR_ROBOT" > secrets/robot.prod - name: Build PROD image diff --git a/.github/workflows/qa-run.yaml b/.github/workflows/qa-run.yaml index 60ffa16..4dc0e83 100644 --- a/.github/workflows/qa-run.yaml +++ b/.github/workflows/qa-run.yaml @@ -20,6 +20,7 @@ env: DRBKPD_KUBECONF: ${{ secrets.DRBKPD_KUBECONF }} DRBKPI_KUBECONF: ${{ secrets.DRBKPI_KUBECONF }} QVO_HARBOR_ROBOT: ${{ secrets.QVO_HARBOR_ROBOT }} + VO_UTIL_KUBECONF: ${{ secrets.VO_UTIL_KUBECONF }} jobs: QA_K8S_Query: @@ -44,14 +45,15 @@ jobs: mkdir secrets touch secrets/qa-bkpi.yaml ; echo "$QBKPI_KUBECONF" > secrets/qa-bkpi.yaml touch secrets/qa-bkpd.yaml ; echo "$QBKPD_KUBECONF" > secrets/qa-bkpd.yaml - touch secrets/bkpi.yaml ; echo "$PBKPI_KUBECONF" > secrets/bkpi.yaml - touch secrets/bkpd.yaml ; echo "$PBKPD_KUBECONF" > secrets/bkpd.yaml - touch secrets/bkpidr.yaml ; echo "$DRBKPI_KUBECONF" > secrets/bkpidr.yaml - touch secrets/bkpddr.yaml ; echo "$DRBKPD_KUBECONF" > secrets/bkpddr.yaml - touch secrets/qvo-ranch.yaml ; echo "$QVO_RANCH_KUBECONF" > secrets/qvo-ranch.yaml - touch secrets/scidmz-ranch.yaml ; echo "$SCIDMZ_KUBECONF" > secrets/scidmz-ranch.yaml - touch secrets/qscidmz-ranch.yaml ; echo "$QSCIDMZ_KUBECONF" > secrets/qscidmz-ranch.yaml - touch secrets/vo-ranch.yaml ; echo "$VO_RANCH_KUBECONF" > secrets/vo-ranch.yaml + touch secrets/bkpi.yaml ; echo "$PBKPI_KUBECONF" > secrets/prod-bkpi.yaml + touch secrets/bkpd.yaml ; echo "$PBKPD_KUBECONF" > secrets/prod-bkpd.yaml + touch secrets/bkpidr.yaml ; echo "$DRBKPI_KUBECONF" > secrets/dr-bkpi.yaml + touch secrets/bkpddr.yaml ; echo "$DRBKPD_KUBECONF" > secrets/dr-bkpd.yaml + touch secrets/qvo-ranch.yaml ; echo "$QVO_RANCH_KUBECONF" > secrets/qa-voranch.yaml + touch secrets/scidmz-ranch.yaml ; echo "$SCIDMZ_KUBECONF" > secrets/prod-scidmz.yaml + touch secrets/qscidmz-ranch.yaml ; echo "$QSCIDMZ_KUBECONF" > secrets/qa-scidmz.yaml + touch secrets/vo-ranch.yaml ; echo "$VO_RANCH_KUBECONF" > secrets/prod-voranch.yaml + touch secrets/vo-ranch.yaml ; echo "$VO_UTIL_KUBECONF" > secrets/prod-voutil.yaml touch secrets/robot.qa ; echo "$QVO_HARBOR_ROBOT" > secrets/robot.qa - name: Build QA image diff --git a/Makefile b/Makefile index a31a861..9bea467 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,19 @@ help: ## Variables HASH := $(shell git rev-parse --short HEAD | tr -d '\n') -CLUSTER ?= bkpd bkpi bkpddr bkpidr qa-bkpd qa-bkpi vo-ranch qvo-ranch scidmz-ranch qscidmz-ranch +CLUSTER ?= prod-bkpd prod-bkpi dr-bkpd dr-bkpi qa-bkpd qa-bkpi prod-voutil prod-voranch qa-voranch prod-scidmz qa-scidmz .PHONY: build dlogin.qa dlogin.prod push.qa push.prod \ secrets.qa secrets.prod deploy.qa deploy.prod +#local-dev: @ pull in secrets from bke-vo-secrets repo +local-dev: + git clone git@github.com:BrownUniversity/bke-vo-secrets.git + cd bke-vo-secrets && make secrets + mkdir secrets + cp ./bke-vo-secrets/kubeconf/*.yaml ./secrets + cp ./bke-vo-secrets/robot/*.txt ./secrets + ## DOCKER BUILD ## #build: @ Build the docker image, one for all envs build: @@ -48,9 +56,9 @@ secrets.qa: #secrets.prod: @ publish secrets to PROD namespace secrets.prod: $(foreach CL_NAME, $(CLUSTER), \ - kubectl delete secret $(CL_NAME) --ignore-not-found -n bkereporting --kubeconfig=secrets/bkpi.yaml; \ + kubectl delete secret $(CL_NAME) --ignore-not-found -n bkereporting --kubeconfig=secrets/prod-bkpi.yaml; \ kubectl create secret generic $(CL_NAME) --from-file=secrets/$(CL_NAME).yaml \ - -n bkereporting --kubeconfig=secrets/bkpi.yaml ; ) + -n bkereporting --kubeconfig=secrets/prod-bkpi.yaml ; ) ## DELPOY APP TO NAMESPACE ## #deploy.qa: @ deploy app to QA namespace @@ -60,5 +68,5 @@ deploy.qa: secrets.qa #deploy.prod: @ deploy app to PROD namespace deploy.prod: secrets.prod - kubectl apply -k overlays/prod --kubeconfig=secrets/bkpi.yaml + kubectl apply -k overlays/prod --kubeconfig=secrets/prod-bkpi.yaml kubectl set image deployment/bkereporting bkereporting=harbor.services.brown.edu/bkereporting/reporter:$(HASH) -n bkereporting --kubeconfig=secrets/bkpi.yaml diff --git a/base/storage.yaml b/base/storage.yaml index cadfa55..79ed6cd 100644 --- a/base/storage.yaml +++ b/base/storage.yaml @@ -7,5 +7,5 @@ spec: - ReadWriteOnce resources: requests: - storage: 1Gi - storageClassName: oitvo-nfs \ No newline at end of file + storage: 200m + storageClassName: vast-oitvo-nfs \ No newline at end of file