diff --git a/.blackbox/blackbox-files.txt b/.blackbox/blackbox-files.txt index 1b3b662..52f78d5 100644 --- a/.blackbox/blackbox-files.txt +++ b/.blackbox/blackbox-files.txt @@ -6,6 +6,7 @@ files/dev-bkpd.yaml files/dev-bkpi.yaml files/qa-bkpd.yaml files/qa-bkpi.yaml +files/robot.dev files/robot.dr files/robot.prod files/robot.qa diff --git a/.github/workflows/dev-build-deploy.yaml b/.github/workflows/dev-build-deploy.yaml index 4b722c1..aefb821 100644 --- a/.github/workflows/dev-build-deploy.yaml +++ b/.github/workflows/dev-build-deploy.yaml @@ -6,7 +6,7 @@ on: jobs: Delete_and_Deploy_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, qa-ghrunner] steps: - name: Checkout @@ -20,7 +20,13 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 + - + name: Build + run: make build + - + name: Push + run: make push.dev - name: Delete run: make delete.dev diff --git a/.github/workflows/dr-build-deploy.yaml b/.github/workflows/dr-build-deploy.yaml index c873f59..5bd8fc7 100644 --- a/.github/workflows/dr-build-deploy.yaml +++ b/.github/workflows/dr-build-deploy.yaml @@ -5,7 +5,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, ghrunner] steps: - name: Checkout @@ -19,7 +19,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build diff --git a/.github/workflows/prod-build-deploy.yaml b/.github/workflows/prod-build-deploy.yaml index 29efdf6..0f75ed2 100644 --- a/.github/workflows/prod-build-deploy.yaml +++ b/.github/workflows/prod-build-deploy.yaml @@ -5,7 +5,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, ghrunner] steps: - name: Checkout @@ -19,7 +19,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build diff --git a/.github/workflows/qa-build-deploy.yaml b/.github/workflows/qa-build-deploy.yaml index 5a2776f..3955c86 100644 --- a/.github/workflows/qa-build-deploy.yaml +++ b/.github/workflows/qa-build-deploy.yaml @@ -6,7 +6,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, qa-ghrunner] steps: - name: Checkout @@ -20,7 +20,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build diff --git a/.gitignore b/.gitignore index 820872d..c20c3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /files/qa-bkpi.yaml /files/dev-bkpi.yaml /files/dev-bkpd.yaml +/files/robot.dev diff --git a/Makefile b/Makefile index aa07eb6..bc3ca9e 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,14 @@ decrypt: files/bkpidr.yaml #build: @ Build bkextest image build: - docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest ./ + docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest -t harbor.cis-dev.brown.edu/bkextest/bkextest ./ ## Docker Logins +#dlogin.dev: @ dev docker login +dlogin.dev: files/robot.dev + cat files/robot.dev | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-dev.brown.edu + #dlogin.qa: @ qa docker login dlogin.qa: files/robot.qa cat files/robot.qa | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-qas.brown.edu @@ -46,6 +50,10 @@ dlogin.dr: files/robot.dr ## Harbor push +#push.dev: @ Push to DEV harbor +push.dev: dlogin.dev + docker push harbor.cis-dev.brown.edu/bkextest/bkextest + #push.qa: @ Push to QA harbor push.qa: dlogin.qa docker push harbor.cis-qas.brown.edu/bkextest/bkextest diff --git a/files/dev-bkpd.yaml.gpg b/files/dev-bkpd.yaml.gpg index 76323ff..b710c2f 100644 Binary files a/files/dev-bkpd.yaml.gpg and b/files/dev-bkpd.yaml.gpg differ diff --git a/files/dev-bkpi.yaml.gpg b/files/dev-bkpi.yaml.gpg index 6cd5ec8..38692c5 100644 Binary files a/files/dev-bkpi.yaml.gpg and b/files/dev-bkpi.yaml.gpg differ diff --git a/files/robot.dev.gpg b/files/robot.dev.gpg new file mode 100644 index 0000000..93f1e7f Binary files /dev/null and b/files/robot.dev.gpg differ