From db20d6292696676f0adf9e165e387fa6bdb2ac6d Mon Sep 17 00:00:00 2001 From: Sam Crang Date: Mon, 2 Dec 2019 16:20:32 +0000 Subject: [PATCH 1/5] Add crang cluster --- clusters/crang-values.yaml | 5 +++++ clusters/crang.yaml | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 clusters/crang-values.yaml create mode 100644 clusters/crang.yaml diff --git a/clusters/crang-values.yaml b/clusters/crang-values.yaml new file mode 100644 index 0000000..5a47fea --- /dev/null +++ b/clusters/crang-values.yaml @@ -0,0 +1,5 @@ +--- +namespaces: +- name: crang-main + ingress: + enabled: true diff --git a/clusters/crang.yaml b/clusters/crang.yaml new file mode 100644 index 0000000..4eff804 --- /dev/null +++ b/clusters/crang.yaml @@ -0,0 +1,45 @@ +account-id: "011571571136" +account-name: "sandbox" +account-role-arn: "arn:aws:iam::011571571136:role/deployer" +ci-worker-count: 1 +ci-worker-instance-type: t3.medium +cluster-domain: "london.crang.govsvc.uk" +cluster-name: "crang" +cluster-number: "102" +concourse-pipeline-name: "crang-deployer" +concourse-team: "gsp" +concourse-url: "https://cd.gds-reliability.engineering" +concourse-username: "gsp" +config-approval-count: 0 +config-approvers: ["samcrang"] +config-organization: "alphagov" +config-path: "clusters/crang.yaml" +config-repository: "tech-ops-cluster-config" +config-trigger: true +config-uri: "https://github.com/alphagov/tech-ops-cluster-config.git" +config-values-path: "clusters/crang-values.yaml" +config-version: "crang-cluster" +disable-destroy: false +eks-version: "1.14" +enable-nlb: false +github-client-id: "NOTID" +github-client-secret: "NOTASECRET" +google-oauth-client-id: "NOTASECRET" +google-oauth-client-secret: "NOTID" +hsm-splunk-hec-token: "NOTATOKEN" +hsm-splunk-index: "NOTAURL" +k8s-splunk-hec-token: "NOTATOKEN" +k8s-splunk-index: "NOTAURL" +maximum-workers-per-az-count: 3 +minimum-workers-per-az-count: 2 +platform-pre-release: true +platform-resource-type: git +platform-tag-filter: "" +platform-version: "move-to-kapp" +splunk-enabled: "0" +splunk-hec-url: "NOTAURL" +trusted-developer-keys: [] +users-trigger: true +vpc-flow-log-splunk-hec-token: "NOTATOKEN" +vpc-flow-log-splunk-index: "NOTAURL" +worker-instance-type: t3.large From 2cfca0bd740547428d74fa66c314967a630c41ea Mon Sep 17 00:00:00 2001 From: Sam Crang Date: Tue, 31 Dec 2019 13:51:22 +0000 Subject: [PATCH 2/5] LOL --- clusters/crang.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/crang.yaml b/clusters/crang.yaml index 4eff804..8319fce 100644 --- a/clusters/crang.yaml +++ b/clusters/crang.yaml @@ -35,7 +35,7 @@ minimum-workers-per-az-count: 2 platform-pre-release: true platform-resource-type: git platform-tag-filter: "" -platform-version: "move-to-kapp" +platform-version: "spike-annotations" splunk-enabled: "0" splunk-hec-url: "NOTAURL" trusted-developer-keys: [] From 09cf2b2eb3ee80a59012871e505f74b55e642e3e Mon Sep 17 00:00:00 2001 From: Sam Crang Date: Tue, 7 Jan 2020 16:37:23 +0000 Subject: [PATCH 3/5] LOL --- clusters/crang.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/clusters/crang.yaml b/clusters/crang.yaml index 8319fce..8103ce4 100644 --- a/clusters/crang.yaml +++ b/clusters/crang.yaml @@ -43,3 +43,4 @@ users-trigger: true vpc-flow-log-splunk-hec-token: "NOTATOKEN" vpc-flow-log-splunk-index: "NOTAURL" worker-instance-type: t3.large +harbor-rds-skip-final-snapshot: true From 1ced633e25ffa76a3246f320f80974bbc7057c06 Mon Sep 17 00:00:00 2001 From: Sam Crang Date: Wed, 8 Jan 2020 11:05:56 +0000 Subject: [PATCH 4/5] LOL --- clusters/crang.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/crang.yaml b/clusters/crang.yaml index 8103ce4..eccdfe4 100644 --- a/clusters/crang.yaml +++ b/clusters/crang.yaml @@ -35,7 +35,7 @@ minimum-workers-per-az-count: 2 platform-pre-release: true platform-resource-type: git platform-tag-filter: "" -platform-version: "spike-annotations" +platform-version: "samcrang" splunk-enabled: "0" splunk-hec-url: "NOTAURL" trusted-developer-keys: [] From 7a43e010d7400e66412c0163c64622ef3b8a2354 Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Mon, 9 Mar 2020 11:46:09 +0000 Subject: [PATCH 5/5] Add config-resource-type=git to all on-demand clusters to remove requirement to have a PR open --- clusters/crang.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/clusters/crang.yaml b/clusters/crang.yaml index eccdfe4..e5b98cc 100644 --- a/clusters/crang.yaml +++ b/clusters/crang.yaml @@ -19,6 +19,7 @@ config-trigger: true config-uri: "https://github.com/alphagov/tech-ops-cluster-config.git" config-values-path: "clusters/crang-values.yaml" config-version: "crang-cluster" +config-resource-type: git disable-destroy: false eks-version: "1.14" enable-nlb: false