From 7b6138505e6eab782ddb88281f9c8df7bf726d44 Mon Sep 17 00:00:00 2001 From: tschneid Date: Tue, 12 Jul 2022 13:32:12 -0500 Subject: [PATCH] Replace go-bindata with go:embed in pkg/deploy --- .gdn/.gdnsuppress | 1043 ++++++++++------- deploy/generate.go | 8 - docs/deploy-development-rp.md | 4 +- ...are-a-shared-rp-development-environment.md | 8 +- hack/devtools/deploy-shared-env.sh | 12 +- hack/e2e/run-rp-and-e2e.sh | 6 +- .../deploy/assets}/aks-development.json | 0 pkg/deploy/assets/assets.go | 11 + .../cluster-development-predeploy.json | 0 .../deploy/assets}/databases-development.json | 0 .../deploy/assets}/env-development.json | 0 .../gateway-production-managed-identity.json | 0 .../gateway-production-parameters.json | 0 ...teway-production-predeploy-parameters.json | 0 .../assets}/gateway-production-predeploy.json | 0 .../deploy/assets}/gateway-production.json | 0 pkg/deploy/assets/generate.go | 6 + .../deploy/assets}/rbac-development.json | 0 .../assets}/rp-development-predeploy.json | 0 .../deploy/assets}/rp-development.json | 0 .../rp-production-global-acr-replication.json | 0 .../rp-production-global-subscription.json | 0 .../deploy/assets}/rp-production-global.json | 0 .../rp-production-managed-identity.json | 0 .../assets}/rp-production-parameters.json | 0 .../rp-production-predeploy-parameters.json | 0 .../assets}/rp-production-predeploy.json | 0 .../assets}/rp-production-subscription.json | 0 .../deploy/assets}/rp-production.json | 0 pkg/deploy/bindata.go | 704 ----------- pkg/deploy/config_test.go | 5 +- pkg/deploy/deploy_gateway.go | 5 +- pkg/deploy/deploy_rp.go | 5 +- pkg/deploy/predeploy.go | 25 +- pkg/util/cluster/cluster.go | 6 +- 35 files changed, 685 insertions(+), 1163 deletions(-) delete mode 100644 deploy/generate.go rename {deploy => pkg/deploy/assets}/aks-development.json (100%) create mode 100644 pkg/deploy/assets/assets.go rename {deploy => pkg/deploy/assets}/cluster-development-predeploy.json (100%) rename {deploy => pkg/deploy/assets}/databases-development.json (100%) rename {deploy => pkg/deploy/assets}/env-development.json (100%) rename {deploy => pkg/deploy/assets}/gateway-production-managed-identity.json (100%) rename {deploy => pkg/deploy/assets}/gateway-production-parameters.json (100%) rename {deploy => pkg/deploy/assets}/gateway-production-predeploy-parameters.json (100%) rename {deploy => pkg/deploy/assets}/gateway-production-predeploy.json (100%) rename {deploy => pkg/deploy/assets}/gateway-production.json (100%) create mode 100644 pkg/deploy/assets/generate.go rename {deploy => pkg/deploy/assets}/rbac-development.json (100%) rename {deploy => pkg/deploy/assets}/rp-development-predeploy.json (100%) rename {deploy => pkg/deploy/assets}/rp-development.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-global-acr-replication.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-global-subscription.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-global.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-managed-identity.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-parameters.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-predeploy-parameters.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-predeploy.json (100%) rename {deploy => pkg/deploy/assets}/rp-production-subscription.json (100%) rename {deploy => pkg/deploy/assets}/rp-production.json (100%) delete mode 100644 pkg/deploy/bindata.go diff --git a/.gdn/.gdnsuppress b/.gdn/.gdnsuppress index 6a61e1f41..5be33f6ae 100644 --- a/.gdn/.gdnsuppress +++ b/.gdn/.gdnsuppress @@ -1,415 +1,628 @@ -{ - "version": "1.0.0", - "suppressionSets": { - "default": { - "name": "default", - "createdDate": "2021-04-19 17:58:41Z", - "lastUpdatedDate": "2021-04-19 17:58:41Z" - } - }, - "results": { - "f78e4b715af3386df99bd3e9bf347f752b3c561325e290eaf0b64bd6e6792783": { - "signature": "f78e4b715af3386df99bd3e9bf347f752b3c561325e290eaf0b64bd6e6792783", - "target": "deploy/cluster-development-predeploy.json", - "memberOf": [ - "default" - ], - "tool": "armory", - "ruleId": "ARM1005", - "justification": null, - "createdDate": "2021-11-16 23:28:02Z", - "expirationDate": null, - "type": null - }, - "986ee7027f0344a26e6b23ffc6882d572558701e70517ac8c8ea879c2a29a868": { - "signature": "986ee7027f0344a26e6b23ffc6882d572558701e70517ac8c8ea879c2a29a868", - "target": "pkg/portal/assets/index.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-html-method", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "b857fede421e892627bd6da61ce8af1268f05a08cea9e85144c18dd5173d3e35": { - "signature": "b857fede421e892627bd6da61ce8af1268f05a08cea9e85144c18dd5173d3e35", - "target": "pkg/portal/assets/index.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-html-method", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "017e16e16457f4a678f671f22265319a30b21b8a1cc0c92afdf53f60ec2b0cdd": { - "signature": "017e16e16457f4a678f671f22265319a30b21b8a1cc0c92afdf53f60ec2b0cdd", - "target": "vendor/go.etcd.io/bbolt/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "183125", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "9d0e60cccd9461c6197f73baf0990a8f1b33e3493ce1f92ece8c707da7b89a3c": { - "signature": "9d0e60cccd9461c6197f73baf0990a8f1b33e3493ce1f92ece8c707da7b89a3c", - "target": "vendor/google.golang.org/grpc/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79569", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "630dcedab4a607f2cdb6919e4eaa8af987f33a3e1bd0bab80efdf27290b31f9f": { - "signature": "630dcedab4a607f2cdb6919e4eaa8af987f33a3e1bd0bab80efdf27290b31f9f", - "target": "pkg/portal/assets/lib/bootstrap-4.5.2.min.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-html-method", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "9e93335f4998702254fec6081c9782ba12cdb90d818a25742717c4895e055cd0": { - "signature": "9e93335f4998702254fec6081c9782ba12cdb90d818a25742717c4895e055cd0", - "target": "pkg/portal/assets/lib/bootstrap-4.5.2.min.js", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "fb3dac99dd840709a8197044f336e613515155803bc89dc65a5e42d2f6c65d9e": { - "signature": "fb3dac99dd840709a8197044f336e613515155803bc89dc65a5e42d2f6c65d9e", - "target": "pkg/portal/assets/lib/bootstrap-select-1.13.14.min.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-inner-html", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "a87cae7679649d21e179514bbda8cecc135a9bc6d2450c4a431f12e6564b4a26": { - "signature": "a87cae7679649d21e179514bbda8cecc135a9bc6d2450c4a431f12e6564b4a26", - "target": "pkg/portal/assets/lib/bootstrap-select-1.13.14.min.js", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "e0ea2773e69dfa94138d7e59a66ef5284f2210e4062ed5d88b658db8fb515fc9": { - "signature": "e0ea2773e69dfa94138d7e59a66ef5284f2210e4062ed5d88b658db8fb515fc9", - "target": "pkg/portal/assets/lib/jquery-3.5.1.min.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-inner-html", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "53a6fd40496c6da617ef3de2ee99d40fe7ec9cb74056e96ee6e278c7ac76d8c9": { - "signature": "53a6fd40496c6da617ef3de2ee99d40fe7ec9cb74056e96ee6e278c7ac76d8c9", - "target": "pkg/portal/assets/lib/jquery-3.5.1.min.js", - "memberOf": [ - "default" - ], - "tool": "ESLint", - "ruleId": "@microsoft/sdl/no-html-method", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "4f6f0c9562220288a4d2ef92d458ee4a3d02375491e5281a04a4e1245eb5cd67": { - "signature": "4f6f0c9562220288a4d2ef92d458ee4a3d02375491e5281a04a4e1245eb5cd67", - "target": "pkg/portal/assets/lib/popper-1.12.9.min.js", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "211972", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "0a658656743ed3c5cb8f34b7da4861fdcc579472ba4013f0b20e2ffb0f6278db": { - "signature": "0a658656743ed3c5cb8f34b7da4861fdcc579472ba4013f0b20e2ffb0f6278db", - "target": "vendor/github.com/Djarvur/go-err113/.golangci.yml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79459", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "71872f574e2dd41672f3de8d647d1467f973e6786d04df6b01df8c536134b190": { - "signature": "71872f574e2dd41672f3de8d647d1467f973e6786d04df6b01df8c536134b190", - "target": "vendor/github.com/golangci/misspell/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79570", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "ac45307b7f52c6a06cd1e2e15f2d88367c6d7ea42beb3bd6e1741f2f1b56d342": { - "signature": "ac45307b7f52c6a06cd1e2e15f2d88367c6d7ea42beb3bd6e1741f2f1b56d342", - "target": "vendor/github.com/gorilla/csrf/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "d8cdc23f09bfb5154317f9d7f84ee0058c7f3607372cf2f93307f6a2aa2b2397": { - "signature": "d8cdc23f09bfb5154317f9d7f84ee0058c7f3607372cf2f93307f6a2aa2b2397", - "target": "vendor/github.com/matoous/godox/.golangci.yml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79459", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "c3ad2e7173a56c742c1f55d549ea9aa1169806f46b649fb36fa5c128a4dd5d13": { - "signature": "c3ad2e7173a56c742c1f55d549ea9aa1169806f46b649fb36fa5c128a4dd5d13", - "target": "vendor/github.com/onsi/ginkgo/CHANGELOG.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "183125", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "f572c9bc592da3e9285b510fe8929d4bfe0c51ef69ea1e298261870c62d431d0": { - "signature": "f572c9bc592da3e9285b510fe8929d4bfe0c51ef69ea1e298261870c62d431d0", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80409", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "abc528ba2ee6fad85ea075e9eb745a016dcd08c4319cbe3dd02e55bf4760de96": { - "signature": "abc528ba2ee6fad85ea075e9eb745a016dcd08c4319cbe3dd02e55bf4760de96", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79458", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "239ea87a93e65e1a44704dda0927367c5631790451b2d8791520d886dcbefe06": { - "signature": "239ea87a93e65e1a44704dda0927367c5631790451b2d8791520d886dcbefe06", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "c9c4231a7c7ec4d3e99bd137c4ad56d79b61286280324395d34deb7a93855ac5": { - "signature": "c9c4231a7c7ec4d3e99bd137c4ad56d79b61286280324395d34deb7a93855ac5", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "fc721b1a51b4e6cc1f0c421114d64415e72d0343f26e4eadb9e3cc8aea3f8dd7": { - "signature": "fc721b1a51b4e6cc1f0c421114d64415e72d0343f26e4eadb9e3cc8aea3f8dd7", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79459", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "435bc256cdfdafdf1998f4ac193889c085d6c33248098e1ececa084f5a848879": { - "signature": "435bc256cdfdafdf1998f4ac193889c085d6c33248098e1ececa084f5a848879", - "target": "vendor/github.com/OpenPeeDeeP/depguard/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79459", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "b10fdc18ed5ab1ad827e2818710485811999407cc75325511412d7313a7e04b9": { - "signature": "b10fdc18ed5ab1ad827e2818710485811999407cc75325511412d7313a7e04b9", - "target": "vendor/gopkg.in/AlecAivazis/survey.v1/README.md", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80241", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "ad62bb8858c3213271808f0ca500a7db9c8d4ef255505a6e49abd719858dd3e0": { - "signature": "ad62bb8858c3213271808f0ca500a7db9c8d4ef255505a6e49abd719858dd3e0", - "target": "vendor/google.golang.org/api/compute/v1/compute-api.json", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "8f798268a0ff7469696f2c43b0d3e4ff70bdd2a7f676430651b44628a76648b9": { - "signature": "8f798268a0ff7469696f2c43b0d3e4ff70bdd2a7f676430651b44628a76648b9", - "target": "vendor/google.golang.org/api/compute/v1/compute-api.json", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "209526", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "47ea1c58d8afd46f92d9ba1f84983dcfc6aacb2f1c7506c08ddcfa9f69cbbe61": { - "signature": "47ea1c58d8afd46f92d9ba1f84983dcfc6aacb2f1c7506c08ddcfa9f69cbbe61", - "target": "vendor/google.golang.org/api/compute/v1/compute-api.json", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "79459", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "5a6392b55b81eccf9ca74a09d4c76f6beeb1975b8e232e662f2e1ac7a264fd17": { - "signature": "5a6392b55b81eccf9ca74a09d4c76f6beeb1975b8e232e662f2e1ac7a264fd17", - "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80409", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "0a91b109e86130d46f7038d7d81266228e886e6d70d1ce0f4e3217f6f3306e36": { - "signature": "0a91b109e86130d46f7038d7d81266228e886e6d70d1ce0f4e3217f6f3306e36", - "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "2ad4a9019f0448d937ead179db770d5cc42b9a75cd07c93fe091af259d891b9a": { - "signature": "2ad4a9019f0448d937ead179db770d5cc42b9a75cd07c93fe091af259d891b9a", - "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80411", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - }, - "6348b36cd4ecfa496869b5fd0fc914e3d254907186edecf953935a63530f78e0": { - "signature": "6348b36cd4ecfa496869b5fd0fc914e3d254907186edecf953935a63530f78e0", - "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", - "memberOf": [ - "default" - ], - "tool": "policheck", - "ruleId": "80409", - "justification": null, - "createdDate": "2021-04-19 17:58:41Z", - "expirationDate": null, - "type": null - } - } -} +{ + "version": "latest", + "suppressionSets": { + "default": { + "name": "default", + "createdDate": "2022-07-14 16:28:44Z", + "lastUpdatedDate": "2022-07-14 16:28:44Z" + } + }, + "results": { + "861b4aa509be8ba632fa51b7edc89b06021fe38246af50f7744cfdba79009ba9": { + "signature": "861b4aa509be8ba632fa51b7edc89b06021fe38246af50f7744cfdba79009ba9", + "alternativeSignatures": [], + "target": ".golangci.yml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "7fe8eb850d966c7157870b76b3daefddc5d13efda37a2a1754b42adbf712f9dc": { + "signature": "7fe8eb850d966c7157870b76b3daefddc5d13efda37a2a1754b42adbf712f9dc", + "alternativeSignatures": [ + "97fd815fc2d19c45b93451b95d6debf2fdb8ab3d31ee3f6ba2974e72ce8a0c90" + ], + "target": "pkg/deploy/assets/cluster-development-predeploy.json", + "memberOf": [ + "default" + ], + "tool": "armory", + "ruleId": "ARM1005", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "20cd31403587ea29d121d28ac3ef7d9b6a7b922baaf817f79ba4ccf0d5730b43": { + "signature": "20cd31403587ea29d121d28ac3ef7d9b6a7b922baaf817f79ba4ccf0d5730b43", + "alternativeSignatures": [], + "target": "portal/v1/build/main.js.LICENSE.txt", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "166862", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "9c277a79f4467e0f7fc8eaeac774f9680776f80a1acfee7a0e3331dde2f7ef6d": { + "signature": "9c277a79f4467e0f7fc8eaeac774f9680776f80a1acfee7a0e3331dde2f7ef6d", + "alternativeSignatures": [], + "target": "vendor/github.com/asaskevich/govalidator/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "033b12764a7474c4b0e0775244f1774754312cd4b37caae4d96d7d0f60c81b55": { + "signature": "033b12764a7474c4b0e0775244f1774754312cd4b37caae4d96d7d0f60c81b55", + "alternativeSignatures": [], + "target": "vendor/github.com/asaskevich/govalidator/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "56ea41a001318274027593ae463cf7f89a94dbb37f4e3d6cd59c975ed10f8ca7": { + "signature": "56ea41a001318274027593ae463cf7f89a94dbb37f4e3d6cd59c975ed10f8ca7", + "alternativeSignatures": [], + "target": "vendor/github.com/asaskevich/govalidator/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "efd9a0f857cc60ccb6cbf3b97bcfe286f2a07819a1904d8c10c98974779546ce": { + "signature": "efd9a0f857cc60ccb6cbf3b97bcfe286f2a07819a1904d8c10c98974779546ce", + "alternativeSignatures": [], + "target": "vendor/github.com/asaskevich/govalidator/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "01d0a3bcf228c06095ea6a3a665ced7c68f4f87b6afc8f58e4631b5d1e0f13c1": { + "signature": "01d0a3bcf228c06095ea6a3a665ced7c68f4f87b6afc8f58e4631b5d1e0f13c1", + "alternativeSignatures": [], + "target": "vendor/github.com/ldez/gomoddirectives/.golangci.yml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "18e0d865d4ca610fb4dd8fb939425585c673ee1bf2d2974a9d4861c369b972cf": { + "signature": "18e0d865d4ca610fb4dd8fb939425585c673ee1bf2d2974a9d4861c369b972cf", + "alternativeSignatures": [], + "target": "vendor/github.com/ldez/tagliatelle/.golangci.yml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "bcf0d595874103b0303c18810a5b6921e1f0c2e292aa9968f2595831292e0188": { + "signature": "bcf0d595874103b0303c18810a5b6921e1f0c2e292aa9968f2595831292e0188", + "alternativeSignatures": [], + "target": "vendor/github.com/tetafro/godot/.godot.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79515", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "e58fd3a21c5864db0b4afce3b13b11e3a03726b1d0bfdeea68f13d9f5d4fbba1": { + "signature": "e58fd3a21c5864db0b4afce3b13b11e3a03726b1d0bfdeea68f13d9f5d4fbba1", + "alternativeSignatures": [], + "target": "vendor/github.com/tetafro/godot/.godot.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79515", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "67b36f68ca9ddd3debfac35de23e26b10e0496293be31a3978d74285887a6dab": { + "signature": "67b36f68ca9ddd3debfac35de23e26b10e0496293be31a3978d74285887a6dab", + "alternativeSignatures": [], + "target": "vendor/github.com/tetafro/godot/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79515", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "7ad4f25bce65c245e144e625c417de6fb3b39f52e79aa5f09f56fc651c499852": { + "signature": "7ad4f25bce65c245e144e625c417de6fb3b39f52e79aa5f09f56fc651c499852", + "alternativeSignatures": [], + "target": "vendor/github.com/tetafro/godot/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79515", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "e081ab90cede04cbe5c547e2dc33d1382e15c5ed071b74933f80a63fcf79e4e6": { + "signature": "e081ab90cede04cbe5c547e2dc33d1382e15c5ed071b74933f80a63fcf79e4e6", + "alternativeSignatures": [], + "target": "vendor/github.com/vmware/govmomi/CHANGELOG.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "5cfcd07fd15820a45711536ae88ff0a18b0d42c9f591e572b06a6aa849353a84": { + "signature": "5cfcd07fd15820a45711536ae88ff0a18b0d42c9f591e572b06a6aa849353a84", + "alternativeSignatures": [], + "target": "vendor/github.com/vmware/govmomi/CHANGELOG.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "036f96ebeebed991d72808efc3637a87005904c81fae88afa9abf44f3eda9902": { + "signature": "036f96ebeebed991d72808efc3637a87005904c81fae88afa9abf44f3eda9902", + "alternativeSignatures": [ + "d5e095bbdc97eaae1249a6aae9c9eccd75257525920be7d5d3b833298a37738f" + ], + "target": "portal/v2/build/static/js/2.fc3140a1.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "@microsoft/sdl/no-insecure-url", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "0ed9d90db1e93e934fd0a70e87014cca029c2c7d828f47e04ab6a9c6b4e9c713": { + "signature": "0ed9d90db1e93e934fd0a70e87014cca029c2c7d828f47e04ab6a9c6b4e9c713", + "alternativeSignatures": [ + "294b83352c4a587a0b6eb6e1090c2fc6272d31f6554a25b1d0ca7c69d41aa486" + ], + "target": "portal/v2/build/static/js/2.fc3140a1.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "@microsoft/sdl/no-msapp-exec-unsafe", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "8af52481386984b25bdb4beba32302408a94e27f1aec31a53bc047575bf01973": { + "signature": "8af52481386984b25bdb4beba32302408a94e27f1aec31a53bc047575bf01973", + "alternativeSignatures": [ + "84c0b8a4ff0e737ff8788aa03d4598fb491d780981318a493bf79f26c19ac855" + ], + "target": "portal/v2/build/static/js/2.fc3140a1.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "@microsoft/sdl/no-inner-html", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "8bdfb16ce30c0025e4311b5912cfe7ddc70f6a889212c48a048981da708b982f": { + "signature": "8bdfb16ce30c0025e4311b5912cfe7ddc70f6a889212c48a048981da708b982f", + "alternativeSignatures": [ + "17b202d0ef148405a4403212a9b0e54578e3e516342fb757f425b0b1d6fe7286" + ], + "target": "portal/v2/build/static/js/2.fc3140a1.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "no-new-func", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "c3657327e17be3d453f4cb3b3a6492f030bdd1dfad59069b4957696f27e9eeca": { + "signature": "c3657327e17be3d453f4cb3b3a6492f030bdd1dfad59069b4957696f27e9eeca", + "alternativeSignatures": [ + "b3c5e5e72a74a7501a6cc376d8a031252110e6eca9560d619828da9cdace2aec" + ], + "target": "portal/v2/build/static/js/2.fc3140a1.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "@microsoft/sdl/no-cookies", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "72de73b024bf65926c0777313084aa8a3fd64319c67e795951cd98cad6c24895": { + "signature": "72de73b024bf65926c0777313084aa8a3fd64319c67e795951cd98cad6c24895", + "alternativeSignatures": [ + "915a97470416fea596a8aa4214f52b22fdc1e2d65e5ceac8aa84b3a66bf8aba8" + ], + "target": "portal/v2/build/static/js/main.fd2b18d9.chunk.js", + "memberOf": [ + "default" + ], + "tool": "eslint", + "ruleId": "@microsoft/sdl/no-insecure-url", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "30149bb02aa791fd719db24cd5e8618527f72cee0a9f15fc148fb2349aaa1e7b": { + "signature": "30149bb02aa791fd719db24cd5e8618527f72cee0a9f15fc148fb2349aaa1e7b", + "alternativeSignatures": [], + "target": "vendor/github.com/go-playground/validator/v10/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79570", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "3a7444d1a22704c9362a3f351f04511675d8730c427407657b4534b35c6ee6b1": { + "signature": "3a7444d1a22704c9362a3f351f04511675d8730c427407657b4534b35c6ee6b1", + "alternativeSignatures": [], + "target": "vendor/honnef.co/go/tools/config/example.conf", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "759ed87029d993b9464f41cb798bc44332bfcc8836fcc402f7e738e8b923aa64": { + "signature": "759ed87029d993b9464f41cb798bc44332bfcc8836fcc402f7e738e8b923aa64", + "alternativeSignatures": [], + "target": "vendor/honnef.co/go/tools/config/example.conf", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "1f4818b0297632065ff8b0b92b645311e4ef07362d71496362e82ac0a233fd37": { + "signature": "1f4818b0297632065ff8b0b92b645311e4ef07362d71496362e82ac0a233fd37", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/admission/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "ca4d8c83cf39c13598e3496f00d89c093aaf577024bba1f7ffd1a0d77db3ca0b": { + "signature": "ca4d8c83cf39c13598e3496f00d89c093aaf577024bba1f7ffd1a0d77db3ca0b", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/admission/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "86ca1172f17702412c68c08bde05cf0de9e4a6129a99279bc9af68717ca7cef4": { + "signature": "86ca1172f17702412c68c08bde05cf0de9e4a6129a99279bc9af68717ca7cef4", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/admission/v1beta1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "f9de626f2b64bf6f6ce3d26e73af18c340d338642aef8c2f17fd2c1603591cd4": { + "signature": "f9de626f2b64bf6f6ce3d26e73af18c340d338642aef8c2f17fd2c1603591cd4", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/admission/v1beta1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "79459", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "e3b1c384080e6cfa348808f8bec8d3e9e0496c4ab172ca0d30655ce570bb2816": { + "signature": "e3b1c384080e6cfa348808f8bec8d3e9e0496c4ab172ca0d30655ce570bb2816", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/authorization/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "37dd1ee487ade1adeb56aaa6fb0f68274171a3414af098373fcd9a0dfe549d49": { + "signature": "37dd1ee487ade1adeb56aaa6fb0f68274171a3414af098373fcd9a0dfe549d49", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/authorization/v1beta1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "9763f3157c33267458f9ef942aed9b684037aa6fde1e548f38ee51f75648755c": { + "signature": "9763f3157c33267458f9ef942aed9b684037aa6fde1e548f38ee51f75648755c", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/rbac/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "afc91461f704db95822457ff9f18dc6dcdef0b230e95c9dac907e4d19f71e2fc": { + "signature": "afc91461f704db95822457ff9f18dc6dcdef0b230e95c9dac907e4d19f71e2fc", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/rbac/v1alpha1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "5ed8e7e1080e7e5bf1de036ec8a2d2e4f5f0132c4b2e3eb566af74aa8022a5b7": { + "signature": "5ed8e7e1080e7e5bf1de036ec8a2d2e4f5f0132c4b2e3eb566af74aa8022a5b7", + "alternativeSignatures": [], + "target": "vendor/k8s.io/api/rbac/v1beta1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "09de897f81319118b46c12ad1f7a65abe83b038b2afcb0e93d08368396d0d733": { + "signature": "09de897f81319118b46c12ad1f7a65abe83b038b2afcb0e93d08368396d0d733", + "alternativeSignatures": [], + "target": "vendor/sigs.k8s.io/kustomize/kyaml/openapi/README.md", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80034", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "3298ccf1cacd6e6d73eac44b636574976c862be8669b957452842cce77bfcc22": { + "signature": "3298ccf1cacd6e6d73eac44b636574976c862be8669b957452842cce77bfcc22", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "7940b437c1e77119dedd93bd0168f2070146b9bdfef0ef9b936c972f01d33cf8": { + "signature": "7940b437c1e77119dedd93bd0168f2070146b9bdfef0ef9b936c972f01d33cf8", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "b6b511f839b1dd9b671fe3e061a8ad47a9e28f9e186e9fb5c56b864ea31c3d02": { + "signature": "b6b511f839b1dd9b671fe3e061a8ad47a9e28f9e186e9fb5c56b864ea31c3d02", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "601bab09849dacecd7ff3f5ed7495730ffb528c437ba1bcac19723b1332dd086": { + "signature": "601bab09849dacecd7ff3f5ed7495730ffb528c437ba1bcac19723b1332dd086", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "227d5c85d1d530a412d5e7b455e0a3548408df5c79bc9868cc183e12c4a301c0": { + "signature": "227d5c85d1d530a412d5e7b455e0a3548408df5c79bc9868cc183e12c4a301c0", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "9961c607a3966899f8182b1fb87ab7af8ef9bc989c25e55b4d9b8a94415d9e35": { + "signature": "9961c607a3966899f8182b1fb87ab7af8ef9bc989c25e55b4d9b8a94415d9e35", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "4142b832048612cf68e29ae2160c33622224d0299726ff95e92b216c49120c0f": { + "signature": "4142b832048612cf68e29ae2160c33622224d0299726ff95e92b216c49120c0f", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "8b285e0e33e33734f67cedcce8cf8f8eeeaa363cadb7a9de3cf1554856e5cd0d": { + "signature": "8b285e0e33e33734f67cedcce8cf8f8eeeaa363cadb7a9de3cf1554856e5cd0d", + "alternativeSignatures": [], + "target": "vendor/github.com/openshift/api/security/v1/generated.proto", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80411", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + }, + "453b5af8bf0414402f81f5b7369f63e263c9f72c8dcf904f401ad789d97aad20": { + "signature": "453b5af8bf0414402f81f5b7369f63e263c9f72c8dcf904f401ad789d97aad20", + "alternativeSignatures": [], + "target": "vendor/sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi/v1212/swagger.json", + "memberOf": [ + "default" + ], + "tool": "policheck", + "ruleId": "80409", + "justification": null, + "createdDate": "2022-07-14 16:28:44Z", + "expirationDate": null, + "type": null + } + } +} \ No newline at end of file diff --git a/deploy/generate.go b/deploy/generate.go deleted file mode 100644 index a0bac8374..000000000 --- a/deploy/generate.go +++ /dev/null @@ -1,8 +0,0 @@ -package deploy - -// Copyright (c) Microsoft Corporation. -// Licensed under the Apache License 2.0. - -//go:generate go run ../hack/gendeploy -//go:generate go run ../vendor/github.com/go-bindata/go-bindata/go-bindata -nometadata -pkg $GOPACKAGE -ignore=generate.go -ignore=config.yaml -o ../pkg/deploy/bindata.go . -//go:generate gofmt -s -l -w ../pkg/deploy/bindata.go diff --git a/docs/deploy-development-rp.md b/docs/deploy-development-rp.md index 786cca97d..942fa47d8 100644 --- a/docs/deploy-development-rp.md +++ b/docs/deploy-development-rp.md @@ -69,7 +69,7 @@ az deployment group create \ -g "$RESOURCEGROUP" \ -n "databases-development-$USER" \ - --template-file deploy/databases-development.json \ + --template-file pkg/deploy/assets/databases-development.json \ --parameters \ "databaseAccountName=$DATABASE_ACCOUNT_NAME" \ "databaseName=$DATABASE_NAME" \ @@ -260,7 +260,7 @@ To access the cluster for oc / kubectl or SSH'ing into the cluster you need to c * Access via Azure Portal -Due to the fact that the AKS cluster is private, you need to be connected to the VPN in order to view certain AKS cluster properties, because the UI interrogates k8s via the VPN. +Due to the fact that the AKS cluster is private, you need to be connected to the VPN in order to view certain AKS cluster properties, because the UI interrogates k8s via the VPN. ### Metrics diff --git a/docs/prepare-a-shared-rp-development-environment.md b/docs/prepare-a-shared-rp-development-environment.md index 2e9e5769c..3cbac18d1 100644 --- a/docs/prepare-a-shared-rp-development-environment.md +++ b/docs/prepare-a-shared-rp-development-environment.md @@ -206,7 +206,7 @@ locations. LOCATION= az deployment sub create \ -l $LOCATION \ - --template-file deploy/rbac-development.json \ + --template-file pkg/deploy/assets/rbac-development.json \ --parameters \ "armServicePrincipalId=$(az ad sp list --filter "appId eq '$AZURE_ARM_CLIENT_ID'" --query '[].objectId' -o tsv)" \ "fpServicePrincipalId=$(az ad sp list --filter "appId eq '$AZURE_FP_CLIENT_ID'" --query '[].objectId' -o tsv)" \ @@ -352,7 +352,7 @@ Variable | Certificate Client | Subscription Type | AAD App Nam # Import firstparty.pem to keyvault v4-eastus-svc az keyvault certificate import --vault-name --name rp-firstparty --file firstparty.pem -# Rotate certificates for SPs ARM, FP, and PORTAL (wherever applicable) +# Rotate certificates for SPs ARM, FP, and PORTAL (wherever applicable) az ad app credential reset \ --id "$AZURE_ARM_CLIENT_ID" \ --cert "$(base64 -w0 /dev/null @@ -511,7 +511,7 @@ each of the bash functions below. > __NOTE:__: in development, if you don't have valid certs for these, you can just upload `localhost.pem` as a placeholder for each of these. This will avoid an error stemming from them not existing, but it will result in logging pods - crash looping in any clusters you make. Additionally, no gateway resources are + crash looping in any clusters you make. Additionally, no gateway resources are created in development so you should not need to execute the cert import statement for the "-gwy" keyvault. @@ -544,4 +544,4 @@ Development value: secrets/cluster-logging-int.pem ## Append Resource Group to Subscription Cleaner DenyList * We have subscription pruning that takes place routinely and need to add our resource group for the shared rp environment to the `denylist` of the cleaner: - * [https://github.com/Azure/ARO-RP/blob/e918d1b87be53a3b3cdf18b674768a6480fb56b8/hack/clean/clean.go#L29](https://github.com/Azure/ARO-RP/blob/e918d1b87be53a3b3cdf18b674768a6480fb56b8/hack/clean/clean.go#L29) + * [https://github.com/Azure/ARO-RP/blob/e918d1b87be53a3b3cdf18b674768a6480fb56b8/hack/clean/clean.go#L29](https://github.com/Azure/ARO-RP/blob/e918d1b87be53a3b3cdf18b674768a6480fb56b8/hack/clean/clean.go#L29) diff --git a/hack/devtools/deploy-shared-env.sh b/hack/devtools/deploy-shared-env.sh index 3e7ad463f..fcef090a4 100644 --- a/hack/devtools/deploy-shared-env.sh +++ b/hack/devtools/deploy-shared-env.sh @@ -11,7 +11,7 @@ deploy_rp_dev_predeploy() { az deployment group create \ -g "$RESOURCEGROUP" \ -n rp-development-predeploy \ - --template-file deploy/rp-development-predeploy.json \ + --template-file pkg/deploy/assets/rp-development-predeploy.json \ --parameters \ "adminObjectId=$ADMIN_OBJECT_ID" \ "fpServicePrincipalId=$(az ad sp list --filter "appId eq '$AZURE_FP_CLIENT_ID'" --query '[].objectId' -o tsv)" \ @@ -24,7 +24,7 @@ deploy_rp_dev() { az deployment group create \ -g "$RESOURCEGROUP" \ -n rp-development \ - --template-file deploy/rp-development.json \ + --template-file pkg/deploy/assets/rp-development.json \ --parameters \ "clusterParentDomainName=$PARENT_DOMAIN_NAME" \ "databaseAccountName=$DATABASE_ACCOUNT_NAME" \ @@ -37,7 +37,7 @@ deploy_env_dev_ci() { az deployment group create \ -g "$RESOURCEGROUP" \ -n env-development \ - --template-file deploy/env-development.json \ + --template-file pkg/deploy/assets/env-development.json \ --parameters \ "ciAzpToken=$AZPTOKEN" \ "ciCapacity=6" \ @@ -56,7 +56,7 @@ deploy_env_dev() { az deployment group create \ -g "$RESOURCEGROUP" \ -n env-development \ - --template-file deploy/env-development.json \ + --template-file pkg/deploy/assets/env-development.json \ --parameters \ "proxyCert=$(base64 -w0