diff --git a/.gitignore b/.gitignore
index 98fcbf979ab4abee083a94f0a743d7251de97dea..1d4183c7c2e0b8238445cb92bceebf52c9a5cdae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,9 @@ certs/
/node_modules
# debug
-npm-debug.log*
\ No newline at end of file
+npm-debug.log*
+
+# ignore developer specific files
+# (used frequently in deployments)
+patch.yaml
+notes
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd2329310f00ae9d4a5f7f484a69049de918e1a6..cc0b9be4b181e450336f41cb62a531396d2d5781 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ variables:
- dogfood
.bigbang:
- image: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/k3d-builder:0.0.1
+ image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/k3d-builder:0.0.1
extends: .bigbang-dogfood
after_script:
- kubectl get all -A
@@ -50,7 +50,7 @@ variables:
#
changelog:
- image: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
+ image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
stage: .pre
extends:
- .bigbang-dogfood
@@ -62,7 +62,7 @@ changelog:
- ./scripts/lint_changelog.sh
version:
- image: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
+ image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
stage: .pre
extends:
- .bigbang-dogfood
@@ -75,7 +75,7 @@ version:
- ./scripts/lint_version.sh
commits:
- image: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
+ image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
stage: .pre
extends:
- .bigbang-dogfood
@@ -87,7 +87,7 @@ commits:
- ./scripts/lint_commits.sh
pre vars:
- image: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
+ image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/pre-envs:ubi8.3
stage: .pre
extends:
- .bigbang-dogfood
@@ -340,7 +340,7 @@ aws/rke2/cluster down:
package:
stage: package
- image: registry.dsop.io/platform-one/big-bang/umbrella/synker:0.0.1
+ image: registry.dso.mil/platform-one/big-bang/umbrella/synker:0.0.1
extends:
- .bigbang-dogfood
rules:
diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
index d576adf87465a210089aa01f222572b9c495ef6c..108c9153013e49d56e4a49235c7b250d8f5f0bce 100644
--- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
+++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
@@ -130,7 +130,7 @@ resource "aws_security_group" "endpoints" {
# Attaches the management vpc (the hub) to the created vpc (the spokes).
#
module "spoke" {
- source = "git::https://repo1.dsop.io/platform-one/big-bang/terraform-modules/spoke-tgw-attachments.git"
+ source = "git::https://repo1.dso.mil/platform-one/big-bang/terraform-modules/spoke-tgw-attachments.git"
name = local.name
hub_vpc_id = var.hub_vpc_id
diff --git a/.gitlab-ci/templates.yml b/.gitlab-ci/templates.yml
index 0904d75f4ea45f458532dfa1d7cf45276051aa90..927ae6f78c8ffa1e8f5678b135bfc2151fe850de 100644
--- a/.gitlab-ci/templates.yml
+++ b/.gitlab-ci/templates.yml
@@ -10,7 +10,7 @@ include:
.terraformer:
image:
- name: registry.dsop.io/platform-one/big-bang/pipeline-templates/pipeline-templates/terraform:0.13.5
+ name: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/terraform:0.13.5
entrypoint:
- /usr/bin/env
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 257e621e0e887221c397d66889ad3b88b7d3a76d..c17f2e9c0bd01c3827d4fcc542475b8b4cb7dfed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,7 +106,7 @@ for setting ingressgateway to use nodeports
### Changed
-* Update Monitoring to [11.0.0-bb.2](https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring/-/tags/11.0.0-bb.2)
+* Update Monitoring to [11.0.0-bb.2](https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring/-/tags/11.0.0-bb.2)
---
@@ -118,11 +118,11 @@ for setting ingressgateway to use nodeports
### Changed
-* Updated Argo to [2.9.5-bb.1](https://repo1.dsop.io/platform-one/big-bang/apps/core/argocd/-/merge_requests/10) for Iron Bank images
-* Updated Authservice to [0.1.3-bb.0](https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice/-/blob/master/CHANGELOG.md#013-bb0) for authservice secret generation: https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice/-/blob/master/CHANGELOG.md#013-bb0
-* Updated ECK-Operator to [1.3.1-bb.1](https://repo1.dsop.io/platform-one/big-bang/apps/core/eck-operator/-/tags/1.3.0-bb.1)
-* Updated Twistlock to [0.0.2-bb.0](https://repo1.dsop.io/platform-one/big-bang/apps/security-tools/twistlock/-/tags/0.0.2-bb.0) to add istio.enabled flag
-* Updated Elasticsearch Kibana to [0.1.2-bb.0](https://repo1.dsop.io/platform-one/big-bang/apps/core/elasticsearch-kibana/-/tags/0.1.2-bb.0) and Pass istio.enabled to Elasticsearch Kibana
+* Updated Argo to [2.9.5-bb.1](https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd/-/merge_requests/10) for Iron Bank images
+* Updated Authservice to [0.1.3-bb.0](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/authservice/-/blob/master/CHANGELOG.md#013-bb0) for authservice secret generation: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/authservice/-/blob/master/CHANGELOG.md#013-bb0
+* Updated ECK-Operator to [1.3.1-bb.1](https://repo1.dso.mil/platform-one/big-bang/apps/core/eck-operator/-/tags/1.3.0-bb.1)
+* Updated Twistlock to [0.0.2-bb.0](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock/-/tags/0.0.2-bb.0) to add istio.enabled flag
+* Updated Elasticsearch Kibana to [0.1.2-bb.0](https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana/-/tags/0.1.2-bb.0) and Pass istio.enabled to Elasticsearch Kibana
---
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2613eb43bbe72f64a48cab0e6f4e4c080476ca9d..cf785ab3f2788677c07f7f1c497301f9a59cd9ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,10 +80,10 @@ git push --force
## Iron Bank Images
-Per the [charter](https://repo1.dsop.io/platform-one/big-bang/charter), all Big Bang packages will leverage container images from [IronBank](https://ironbank.dsop.io/). In order to pull these images, ImagePullSecrets must be provided to BigBang. To obtain access to these images, follow the guides below. These steps should NOT be used for production since the API keys for a user are only valid when the user is logged into [Registry1](https://registry1.dsop.io)
+Per the [charter](https://repo1.dso.mil/platform-one/big-bang/charter), all Big Bang packages will leverage container images from [IronBank](https://ironbank.dso.mil/). In order to pull these images, ImagePullSecrets must be provided to BigBang. To obtain access to these images, follow the guides below. These steps should NOT be used for production since the API keys for a user are only valid when the user is logged into [Registry1](https://registry1.dso.mil)
-1) Register for a free Ironbank account [Here](https://sso-info.il2.dsop.io/new_account.html)
-1) Log into the [Iron Bank Registry](https://registry1.dsop.io), in the top right click your *Username* and then *User Profile* to get access to your *CLI secret*/API keys.
+1) Register for a free Ironbank account [Here](https://sso-info.il2.dso.mil/new_account.html)
+1) Log into the [Iron Bank Registry](https://registry1.dso.mil), in the top right click your *Username* and then *User Profile* to get access to your *CLI secret*/API keys.
1) When installing BigBang, set the Helm Values `registryCredentials.username` and `registryCredentials.password` to match your Registry1 username and API token
## Local Kubernetes cluster
@@ -99,7 +99,7 @@ k3d cluster create --k3s-server-arg "--disable=traefik" --k3s-server-arg "--disa
For development, it is quicker to test changes without having to push to Git. To do this, we can bypass Flux2 and deploy Big Bang directly with its Helm chart.
-Start by creating `myvalues.yaml` to configure your local Big Bang. Big Bang's template repository contains a starter [development values.yaml](https://repo1.dsop.io/platform-one/big-bang/customers/template/-/blob/main/dev/configmap.yaml).
+Start by creating `myvalues.yaml` to configure your local Big Bang. Big Bang's template repository contains a starter [development values.yaml](https://repo1.dso.mil/platform-one/big-bang/customers/template/-/blob/main/dev/configmap.yaml).
Configure `myvalues.yaml` to suit your needs.
@@ -121,7 +121,7 @@ For more extensive development, use the [Development Guide](docs/c_development.m
## Testing Big Bang Development Changes
-Development changes should be tested using a full GitOps environment. The [Big Bang environment template](https://repo1.dsop.io/platform-one/big-bang/customers/template/) should be replicated, either on a branch or new repository, to start your deployment. Follow the instructions in the [template's readme](https://repo1.dsop.io/platform-one/big-bang/customers/template/-/tree/main/README.md) and in the [Big Bang docs](./docs) for configuration.
+Development changes should be tested using a full GitOps environment. The [Big Bang environment template](https://repo1.dso.mil/platform-one/big-bang/customers/template/) should be replicated, either on a branch or new repository, to start your deployment. Follow the instructions in the [template's readme](https://repo1.dso.mil/platform-one/big-bang/customers/template/-/tree/main/README.md) and in the [Big Bang docs](./docs) for configuration.
Follow the [Big Bang documentation](./docs) for testing a full deployment of Big Bang.
@@ -173,7 +173,7 @@ This stage is ran on every commit, and is a requirement for merging.
Ultimately, BigBang is designed to deploy production ready workloads on real infrastructure. While local and ephemeral clusters are excellent for fast feedback during development, changes must ultimately be tested on real clusters on real infrastructure.
-As part of BigBang's [charter](https://repo1.dsop.io/platform-one/big-bang/charter), it is expected work on any CNCF conformant kubernetes cluster, on multiple clouds, and on premise environments. By very definition, this means infrastructure testing is _slow_. To strive for a pipeline with a happy medium of providing fast feedback while still exhaustively testing against environments that closely mirror production, __infrastructure testing only occurs on manual actions on merge request commits.__
+As part of BigBang's [charter](https://repo1.dso.mil/platform-one/big-bang/charter), it is expected work on any CNCF conformant kubernetes cluster, on multiple clouds, and on premise environments. By very definition, this means infrastructure testing is _slow_. To strive for a pipeline with a happy medium of providing fast feedback while still exhaustively testing against environments that closely mirror production, __infrastructure testing only occurs on manual actions on merge request commits.__
When you are comfortable your branch is ready to be merged, opening up an merge request will trigger the creation of a suite of infrastructure testing jobs which will require a manual action from a project maintainer (assuming previous linting and smoke tests have passed). Once the commit(s) are validated against the infrastructure tests, your changes are ready to be merged!
@@ -191,7 +191,7 @@ For each cloud, a BigBang owned network will be created that conform with the ap
Several types of clusters are created within the previously provisioned network(s), and follow the vendors recommended iac approach.
-For example, an `rke2` cluster is created that leverages the upstream [terraform modules](https://repo1.dsop.io/platform-one/distros/rancher-federal/rke2/rke2-aws-terraform), and an `eks` cluster is created with the upstream [terraform modules](https://docs.microsoft.com/en-us/azure/developer/terraform/create-k8s-cluster-with-tf-and-aks).
+For example, an `rke2` cluster is created that leverages the upstream [terraform modules](https://repo1.dso.mil/platform-one/distros/rancher-federal/rke2/rke2-aws-terraform), and an `eks` cluster is created with the upstream [terraform modules](https://docs.microsoft.com/en-us/azure/developer/terraform/create-k8s-cluster-with-tf-and-aks).
It is a hard requriement at this stage that every cluster outputs an admin scoped `kubeconfig` as a gitlab ci artifact. This artifact will be leveraged in the following stages for interacting with the created cluster.
diff --git a/Packages.md b/Packages.md
index aec07a16b5df99b5eef937649efc770fb75d45cf..eed0978b74976abb9b735d3bd87350cc6eebedb8 100644
--- a/Packages.md
+++ b/Packages.md
@@ -4,22 +4,22 @@
| Package | Status |
| ---- | --- |
-| [Istio Operator](https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-operator) |  |
-| [Istio Controlplane](https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-controlplane) |  |
-| [Monitoring](https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring) |  |
-| [ECK Operator](https://repo1.dso.mil/platform-one/big-bang/apps/core/eck-operator) |  |
-| [Elasticsearch Kibana](https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana) | |
-| [Fluentbit](https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit) |  |
-| [OPA Gatekeeper](https://repo1.dso.mil/platform-one/big-bang/apps/core/policy) |  |
-| [Argocd](https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd) | |
-| [Cluster Auditor](https://repo1.dso.mil/platform-one/big-bang/apps/core/cluster-auditor) |  |
+| [Istio Operator](https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-operator) |  |
+| [Istio Controlplane](https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-controlplane) |  |
+| [Monitoring](https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring) |  |
+| [ECK Operator](https://repo1.dso.mil/platform-one/big-bang/apps/core/eck-operator) |  |
+| [Elasticsearch Kibana](https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana) | |
+| [Fluentbit](https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit) |  |
+| [OPA Gatekeeper](https://repo1.dso.mil/platform-one/big-bang/apps/core/policy) |  |
+| [Argocd](https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd) | |
+| [Cluster Auditor](https://repo1.dso.mil/platform-one/big-bang/apps/core/cluster-auditor) |  |
## Security
| Package | Status |
| ---- | --- |
-| [Keycloak](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/keycloak) |  |
-| [Twistlock](https://repo1.dsop.io/platform-one/big-bang/apps/security-tools/twistlock) |  |
+| [Keycloak](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/keycloak) |  |
+| [Twistlock](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock) |  |
| [Anchore Enterprise](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise) | 
| [Authservice](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/authservice) | 
@@ -28,4 +28,4 @@
| Package | Status |
| ---- | --- |
| [Gitlab](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab) |  |
-| [Gitlab Runner](https://repo1.dsop.io/platform-one/big-bang/apps/developer-tools/gitlab-runner) |  |
+| [Gitlab Runner](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner) |  |
diff --git a/README.md b/README.md
index 363f8d9cc688c9954b9bf3e2ccf4585fb0676e51..9c606b4ecfdc68757d6f1b5fee415585adb286d0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Additional information can be found in [Big Bang Overview](./docs/1_overview.md)
## Getting Started
-To start using Big Bang, you will need to create your own Big Bang environment tailored to your needs. The [Big Bang customer template](https://repo1.dsop.io/platform-one/big-bang/customers/template/) is provided for you to copy into your own Git repository and begin modifications. Follow the instructions in [Big Bang Getting Started](./docs/2_getting_started.md) to customize and deploy Big Bang.
+To start using Big Bang, you will need to create your own Big Bang environment tailored to your needs. The [Big Bang customer template](https://repo1.dso.mil/platform-one/big-bang/customers/template/) is provided for you to copy into your own Git repository and begin modifications. Follow the instructions in [Big Bang Getting Started](./docs/2_getting_started.md) to customize and deploy Big Bang.
### Contributing
diff --git a/base/gitrepository.yaml b/base/gitrepository.yaml
index 3d8a00a772549b5c47376960dcd4bd4085e601bb..30a8b8ca92b845835b7665ce5951c8f71cef3d1e 100644
--- a/base/gitrepository.yaml
+++ b/base/gitrepository.yaml
@@ -9,6 +9,6 @@ spec:
/**/*.txt
/**/*.sh
interval: 10m
- url: https://repo1.dsop.io/platform-one/big-bang/umbrella.git
+ url: https://repo1.dso.mil/platform-one/big-bang/umbrella.git
ref:
tag: 1.0.7
\ No newline at end of file
diff --git a/chart/templates/argocd/argocd-helmrelease.yaml b/chart/templates/argocd/argocd-helmrelease.yaml
index 49deb582217c48a394a3722c7db9db7c224b4e59..300e50f3d71f412cd7d550c4d185319a8bdf8ba7 100644
--- a/chart/templates/argocd/argocd-helmrelease.yaml
+++ b/chart/templates/argocd/argocd-helmrelease.yaml
@@ -35,7 +35,6 @@ spec:
timeout: {{ .rollback.timeout }}
cleanupOnFail: {{ .rollback.cleanupOnFail }}
{{- end }}
-
valuesFrom:
- name: values
kind: Secret
@@ -43,7 +42,17 @@ spec:
values:
hostname: {{ .Values.hostname }}
createNamespace: false
- imagePullSecrets:
+ global:
+ imagePullSecrets:
+ - name: private-registry
+ controller:
+ imagePullSecrets:
+ - name: private-registry
+ dex:
+ imagePullSecrets:
+ - name: private-registry
+ redis:
+ imagePullSecrets:
- name: private-registry
server:
config:
diff --git a/chart/templates/authservice/authservice-helmrelease.yaml b/chart/templates/authservice/authservice-helmrelease.yaml
index 40fd61db5b504bd29fcdc0480b7717d29582251d..feb288e7372511fbaf0c554115a4c6e7ad174720 100644
--- a/chart/templates/authservice/authservice-helmrelease.yaml
+++ b/chart/templates/authservice/authservice-helmrelease.yaml
@@ -42,7 +42,7 @@ spec:
valuesKey: "authservice.yaml"
values:
imagePullSecrets:
- - name: private-registry
+ - name: private-registry
global:
oidc:
host: {{ .Values.sso.oidc.host }}
diff --git a/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml b/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
index e18225766125140b2f55367d64e10c29cc896a36..04b9724c19e3b0722a93766caf85d72ca48be661 100644
--- a/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
+++ b/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
@@ -42,8 +42,9 @@ spec:
valuesKey: "clusterauditor.yaml"
values:
- #conversion from umbrella values to package values
- imagePullSecrets: [ private-registry ]
+ elasticsearch:
+ imagePullSecrets:
+ - name: private-registry
dependsOn:
- name: ek
diff --git a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
index c198455c2dd2b95b2dc8290b6033c401ae41250a..b6949f8a76e6d2220604197f3f6e14e92bd0f0c0 100644
--- a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
+++ b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
@@ -43,10 +43,10 @@ spec:
values:
image:
- repository: registry1.dsop.io/ironbank/opensource/openpolicyagent/gatekeeper
+ repository: registry1.dso.mil/ironbank/opensource/openpolicyagent/gatekeeper
release: v3.1.2
disableValidatingWebhook: true
createNamespace: false
imagePullSecrets:
- - name: private-registry
+ - name: private-registry
{{- end }}
\ No newline at end of file
diff --git a/chart/templates/istio/operator/istio-operator-helmrelease.yaml b/chart/templates/istio/operator/istio-operator-helmrelease.yaml
index 6280ddf1e1d4de1354f27e11fb2cb3d3a0d9bbed..fa147fdf1363a9d7d21287813241cc03344e5faa 100644
--- a/chart/templates/istio/operator/istio-operator-helmrelease.yaml
+++ b/chart/templates/istio/operator/istio-operator-helmrelease.yaml
@@ -42,7 +42,7 @@ spec:
valuesKey: "istiooperator.yaml"
values:
- hub: registry1.dsop.io/ironbank/opensource/istio
+ hub: registry1.dso.mil/ironbank/opensource/istio
tag: 1.7.3
createNamespace: false
diff --git a/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml b/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml
index b51fe1a53af09a8e4a694da1ea73bff7a94f95cc..e735bc26f1decddfa0542d923087252b70cbdd3c 100644
--- a/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml
@@ -48,11 +48,11 @@ spec:
kibana:
version: 7.9.2
imagePullSecrets:
- - name: private-registry
+ - name: private-registry
elasticsearch:
version: 7.9.2
imagePullSecrets:
- - name: private-registry
+ - name: private-registry
{{/* ECK and Logging _always_ depend on .Values.logging being enabled, so can assume they exist here */}}
dependsOn:
diff --git a/chart/templates/monitoring/monitoring-helmrelease.yaml b/chart/templates/monitoring/monitoring-helmrelease.yaml
index 4ad3522559d014def1cbdafd7b20ceb5b1d91bd7..11eb3f117a6454cb2a5d6bd07f4b32e7b395158c 100644
--- a/chart/templates/monitoring/monitoring-helmrelease.yaml
+++ b/chart/templates/monitoring/monitoring-helmrelease.yaml
@@ -49,7 +49,7 @@ spec:
enabled: {{ .Values.monitoring.sso.enabled }}
global:
imagePullSecrets:
- - name: private-registry
+ - name: private-registry
grafana:
image:
pullSecrets:
diff --git a/chart/values.yaml b/chart/values.yaml
index 2d30307352ae8563ef152d858f9224e6d974c63a..5a59626d56d31c34acb02fcc32a890327b92aebe 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -6,14 +6,14 @@ offline: false
# Regisitires can be an explicit map of registries as provided here
registryCredentials:
- registry: registry1.dsop.io
+ registry: registry1.dso.mil
username: ""
password: ""
email: ""
# Or a list of registires:
# registryCredentials:
-# - registry: registry1.dsop.io
+# - registry: registry.dso.mil
# username: user.name
# password: user-secret
# email: xxx@xxx.xxx
@@ -21,7 +21,7 @@ registryCredentials:
# username: user.name
# password: user-secret
# email: xxx@xxx.xxx
-# - registry: registry.dso.mil
+# - registry: registry.example.com
# username: user.name
# password: user-secret
# email: xxx@xxx.xxx
@@ -73,9 +73,9 @@ flux:
istio:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/istio-controlplane.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-controlplane.git
path: "./chart"
- tag: "1.7.3-bb.6"
+ tag: "1.7.3-bb.7"
sso:
enabled: false
kiali:
@@ -89,9 +89,9 @@ istio:
istiooperator:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/istio-operator.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-operator.git
path: "./chart"
- tag: "1.7.0-bb.0"
+ tag: "1.7.0-bb.1"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
@@ -101,9 +101,9 @@ istiooperator:
clusterAuditor:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/cluster-auditor.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/cluster-auditor.git
path: "./chart"
- tag: "0.1.7-bb.0"
+ tag: "0.1.8-bb.1"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
@@ -113,9 +113,9 @@ clusterAuditor:
gatekeeper:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/policy.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/policy.git
path: "./chart"
- tag: "3.1.2-bb.2"
+ tag: "3.1.2-bb.3"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
@@ -125,25 +125,25 @@ gatekeeper:
logging:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/elasticsearch-kibana.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
path: "./chart"
- tag: "0.1.2-bb.0"
+ tag: "0.1.3-bb.1"
values: {}
eckoperator:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/eck-operator.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/eck-operator.git
path: "./chart"
- tag: "1.3.0-bb.2"
+ tag: "1.3.0-bb.3"
values: {}
fluentbit:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/fluentbit.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit.git
path: "./chart"
- tag: "0.1.0-bb.0"
+ tag: "0.1.0-bb.1"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
@@ -153,9 +153,9 @@ fluentbit:
monitoring:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
path: "./chart"
- tag: "11.0.0-bb.9"
+ tag: "11.0.0-bb.10"
sso:
enabled: false
prometheus:
@@ -179,9 +179,9 @@ monitoring:
twistlock:
enabled: true
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/security-tools/twistlock.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock.git
path: "./chart"
- tag: "0.0.2-bb.0"
+ tag: "0.0.2-bb.1"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
@@ -189,9 +189,9 @@ addons:
argocd:
enabled: false
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/argocd.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
path: "./chart"
- tag: "2.9.5-bb.2"
+ tag: "2.9.5-bb.4"
values: {}
authservice:
@@ -203,9 +203,9 @@ addons:
# callback_uri: "https://somecallback"
enabled: false
git:
- repo: https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice.git
+ repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/authservice.git
path: "./chart"
- tag: "0.1.6-bb.0"
+ tag: "0.1.6-bb.1"
# Dont put chain configuraitons in this section
values: {}
# Put additional chain configuration in this section
@@ -219,6 +219,7 @@ addons:
tag: "4.2.0-bb.1"
haproxy:
+ enabled: false
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy.git
path: "./chart"
diff --git a/docs/1_overview.md b/docs/1_overview.md
index 1f7a9d9d30c494dc75c92fea93eb338238717771..128926942e18c4a3b3675de6a46a08eb3e239a74 100644
--- a/docs/1_overview.md
+++ b/docs/1_overview.md
@@ -27,7 +27,7 @@ Big Bang is a declarative, continuous delivery tool for core DoD hardened and ap
### Big Bang Components
-Big Bang is made of several components that operate together. These include a [base Kustomize](../base/), a [Helm chart](../chart), [packages](../chart/templates), and an [environment](https://repo1.dsop.io/platform-one/big-bang/customers/bigbang). The environment and base Kustomize are used together to deploy the Big Bang configuration and Helm chart. The Helm chart is then used to facilitate deployment of the packages.
+Big Bang is made of several components that operate together. These include a [base Kustomize](../base/), a [Helm chart](../chart), [packages](../chart/templates), and an [environment](https://repo1.dso.mil/platform-one/big-bang/customers/bigbang). The environment and base Kustomize are used together to deploy the Big Bang configuration and Helm chart. The Helm chart is then used to facilitate deployment of the packages.
### Flux v2
@@ -57,19 +57,19 @@ The following packages are included in a default deployment of Big Bang:
|Name|Description|Helm Chart Repo|
|--|--|--|
-|[Istio](https://istio.io/)|[Service Mesh](https://www.redhat.com/en/topics/microservices/what-is-a-service-mesh)|[Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/servicemesh.git)|
-|Cluster Auditor| |[Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/cluster-auditor.git)|
-|[Open Policy Agent Gatekeeper](https://github.com/open-policy-agent/gatekeeper)| Policy Management | [Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/policy.git)|
-|[Elastic Cloud on Kubernetes (ECK)](https://www.elastic.co/guide/en/cloud-on-k8s/current/index.html)| Logging; Incl. Elasticsearch & Kibana |[Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/elasticsearch-kibana.git)|
-|[Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/)| Monitoring |[Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring.git)|
-|[Twistlock](https://www.paloaltonetworks.com/prisma/cloud)| Security Scanning |[Link](https://repo1.dsop.io/platform-one/big-bang/apps/security-tools/twistlock.git)|
+|[Istio](https://istio.io/)|[Service Mesh](https://www.redhat.com/en/topics/microservices/what-is-a-service-mesh)|[Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/servicemesh.git)|
+|Cluster Auditor| |[Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/cluster-auditor.git)|
+|[Open Policy Agent Gatekeeper](https://github.com/open-policy-agent/gatekeeper)| Policy Management | [Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/policy.git)|
+|[Elastic Cloud on Kubernetes (ECK)](https://www.elastic.co/guide/en/cloud-on-k8s/current/index.html)| Logging; Incl. Elasticsearch & Kibana |[Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git)|
+|[Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/)| Monitoring |[Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git)|
+|[Twistlock](https://www.paloaltonetworks.com/prisma/cloud)| Security Scanning |[Link](https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock.git)|
In addition, the following packages can be added onto the default deployment:
|Name|Description|Helm Chart Repo|
|--|--|--|
-|[Argo CD](https://argoproj.github.io/argo-cd/)| Continuous Delivery |[Link](https://repo1.dsop.io/platform-one/big-bang/apps/core/argocd.git)|
-|Auth Service|Single Sign On|[Link](https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice.git)
+|[Argo CD](https://argoproj.github.io/argo-cd/)| Continuous Delivery |[Link](https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git)|
+|Auth Service|Single Sign On|[Link](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/authservice.git)
---
diff --git a/docs/2_getting_started.md b/docs/2_getting_started.md
index 47bd4d13ed92def8994ca1a857541038d291bb6b..268c8a45103966a973d876045e1261d9dca92413 100644
--- a/docs/2_getting_started.md
+++ b/docs/2_getting_started.md
@@ -31,7 +31,7 @@ Table of Contents
[Flux v2](https://toolkit.fluxcd.io/) must be installed into the Kubernetes cluster before deploying Big Bang. There are three options for doing this:
-1. (Recommended) Deploy officially through [Iron Bank](registry1.dsop.io)
+1. (Recommended) Deploy officially through [Iron Bank](registry1.dso.mil)
```bash
# The script will do the following:
@@ -42,10 +42,10 @@ Table of Contents
hack/flux-install.sh
```
-1. Deploy unofficially through [Big Bang's Repo](https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/fluxv2/container_registry)
+1. Deploy unofficially through [Big Bang's Repo](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/fluxv2/container_registry)
```bash
- flux install --registry registry.dsop.io/platform-one/big-bang/apps/sandbox/fluxv2
+ flux install --registry registry.dso.mil/platform-one/big-bang/apps/sandbox/fluxv2
```
1. Deploy for development through [DockerHub](https://hub.docker.com/search?q=fluxcd)
@@ -56,7 +56,7 @@ Table of Contents
## Configuration Template
-A [template for configuring multi-cluster environments](https://repo1.dsop.io/platform-one/big-bang/customers/template/) is provided to assist with getting Big Bang setup correctly. You should make a copy of the `./bigbang` folder from the [customer Big Bang repository](https://repo1.dsop.io/platform-one/big-bang/customers/template) and place it into a Git repository under your control.
+A [template for configuring multi-cluster environments](https://repo1.dso.mil/platform-one/big-bang/customers/template/) is provided to assist with getting Big Bang setup correctly. You should make a copy of the `./bigbang` folder from the [customer Big Bang repository](https://repo1.dso.mil/platform-one/big-bang/customers/template) and place it into a Git repository under your control.
### Overview
@@ -68,7 +68,7 @@ The template is setup to allow you to customize the Big Bang deployment for your
- Reference to SOPS private key - See the [encryption help](3_encryption.md) for more information.
- Iron Bank pull credentials
-The [Configuration Template help](https://repo1.dsop.io/platform-one/big-bang/customers/template/-/blob/main/README.md) contains details on how to setup these items.
+The [Configuration Template help](https://repo1.dso.mil/platform-one/big-bang/customers/template/-/blob/main/README.md) contains details on how to setup these items.
If there is additional configuration you want, refer to the [configuration help](4_configuration.md) for details.
diff --git a/docs/3_encryption.md b/docs/3_encryption.md
index 792a92d65f0055d766f31030f151b94fb0f17729..d21fa4b85cdbe5b326d7a59464efab1464474263 100644
--- a/docs/3_encryption.md
+++ b/docs/3_encryption.md
@@ -107,7 +107,7 @@ TBD - [This article](https://blog.doit-intl.com/injecting-secrets-from-aws-gcp-o
## Configure Big Bang
-Big Bang needs to know how to retrieve the private key so it can deploy the encrypted secrets from Git. Decryption configuration is placed in the top-level manifest (e.g. `dev.yaml`, `prod.yaml`) from the [Big Bang template](https://repo1.dsop.io/platform-one/big-bang/customers/template). By default, the `Kustomization` resource uses a Secret named `sops-gpg` for the private key as shown here:
+Big Bang needs to know how to retrieve the private key so it can deploy the encrypted secrets from Git. Decryption configuration is placed in the top-level manifest (e.g. `dev.yaml`, `prod.yaml`) from the [Big Bang template](https://repo1.dso.mil/platform-one/big-bang/customers/template). By default, the `Kustomization` resource uses a Secret named `sops-gpg` for the private key as shown here:
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
diff --git a/docs/4_configuration.md b/docs/4_configuration.md
index 2f4ac3ea3666a3fb59a7cb7ace7e40f5e9eef6ab..f589a748731559633b9090c09886d26f56cbc224 100644
--- a/docs/4_configuration.md
+++ b/docs/4_configuration.md
@@ -19,7 +19,7 @@ Table of Contents
## Overview
-Configuration of Big Bang is achieved by overriding default values set in the package or Big Bang using the [environment template](https://repo1.dsop.io/platform-one/big-bang/customers/template). The template has a 4 potential locations for setting values: `base/secrets.enc.yaml`, `base/configmap.yaml`, `<env>/secrets.enc.yaml`, and `<env>/configmap.yaml`. Overrides proceed as follows, with `<env>/configmap.yaml` having the highest precedence.
+Configuration of Big Bang is achieved by overriding default values set in the package or Big Bang using the [environment template](https://repo1.dso.mil/platform-one/big-bang/customers/template). The template has a 4 potential locations for setting values: `base/secrets.enc.yaml`, `base/configmap.yaml`, `<env>/secrets.enc.yaml`, and `<env>/configmap.yaml`. Overrides proceed as follows, with `<env>/configmap.yaml` having the highest precedence.
```mermaid
graph TD
@@ -31,7 +31,7 @@ graph TD
-->env-c[`<env>/configmap.yaml` values]
```
-In all four cases, Big Bang reads a single key named `values.yaml` that contains the data to override. See the [Big Bang environment template](https://repo1.dsop.io/platform-one/big-bang/customers/template) for examples on how to use these files to override values.
+In all four cases, Big Bang reads a single key named `values.yaml` that contains the data to override. See the [Big Bang environment template](https://repo1.dso.mil/platform-one/big-bang/customers/template) for examples on how to use these files to override values.
## Pre-configuration
@@ -54,7 +54,7 @@ At a minimum, the following items must be configured for a default Big Bang depl
- [SOPS private key reference](3_encryption.md).
- [Registry pull credentials](#registry-pull-credentials)
-The Big Bang [Environment Template](https://repo1.dsop.io/platform-one/big-bang/customers/template) has placeholders for all of the above.
+The Big Bang [Environment Template](https://repo1.dso.mil/platform-one/big-bang/customers/template) has placeholders for all of the above.
## Big Bang Globals
@@ -72,7 +72,7 @@ Registry credentials are used to pull images for Big Bang. By default, it point
| Key | Description | Type | Default |
|--|--|--|--|
-| `registry` | Container registry location | Domain Name | `registry1.dsop.io`
+| `registry` | Container registry location | Domain Name | `registry1.dso.mil`
| `username`* | Container registry username | String | "" |
| `password`* | User's password | String | "" |
| `email` | User's email | Email | "" |
@@ -97,7 +97,7 @@ Each package (e.g. `istio`, `clusterAuditor`) has configuration to control how B
| Key | Description | Type | Default |
|--|--|--|--|
| `enabled` | Determines if the package will get deployed or skipped | Boolean | `true` (unless its an `addon`) |
-| `git.repo` | Location of the Git repo holding the package deployment resources | URL | `https://repo1.dsop.io/platform-one/big-bang/apps/...`
+| `git.repo` | Location of the Git repo holding the package deployment resources | URL | `https://repo1.dso.mil/platform-one/big-bang/apps/...`
| `git.branch` | Branch to use for package deployment resources | string | `chart-release` or `release-vx.x.x` |
| `git.commit` | SHA of specific commit to use in Git for package deployment resources | SHA | null |
| `git.tag` | Git tag to use for package deployment resources | string | null |
@@ -124,7 +124,7 @@ In your `kustomization.yaml` under your environment, here is an example of how t
```yaml
bases:
-- https://repo1.dsop.io/platform-one/big-bang/umbrella.git/base/?ref=v1.2.*
+- https://repo1.dso.mil/platform-one/big-bang/umbrella.git/base/?ref=v1.2.*
patchesStrategicMerge:
- |-
apiVersion: source.toolkit.fluxcd.io/v1beta1
@@ -151,7 +151,7 @@ metadata:
namespace: bigbang
spec:
interval: 1m
- url: https://repo1.dsop.io/platform-one/big-bang/customers/template.git
+ url: https://repo1.dso.mil/platform-one/big-bang/customers/template.git
ref:
branch: main
---
diff --git a/docs/5_deployment.md b/docs/5_deployment.md
index bd61f0343f8b713fa193030db10c11ffd630ecc4..87fd8366e4dad084c43e895ab0d9764915ea0170 100644
--- a/docs/5_deployment.md
+++ b/docs/5_deployment.md
@@ -74,7 +74,7 @@ The following commands will help you monitor the progress of the Big Bang deploy
# `environment-repo`: STATUS should be True
NAMESPACE NAME URL READY STATUS AGE
- bigbang environment-repo https://repo1.dsop.io/platform-one/big-bang/customers/template.git True Fetched revision: main/185e252f4452d897531ab0314adc7a189562be31 2m7s
+ bigbang environment-repo https://repo1.dso.mil/platform-one/big-bang/customers/template.git True Fetched revision: main/185e252f4452d897531ab0314adc7a189562be31 2m7s
```
1. Verify the environment Kustomization properly worked
@@ -116,7 +116,7 @@ The following commands will help you monitor the progress of the Big Bang deploy
# 'bigbang' READY should be True
NAME URL READY STATUS AGE
- bigbang https://repo1.dsop.io/platform-one/big-bang/umbrella.git True Fetched revision: master/8a4a1ddd0c9edf316f5362680cf2921baf0c3451 25m
+ bigbang https://repo1.dso.mil/platform-one/big-bang/umbrella.git True Fetched revision: master/8a4a1ddd0c9edf316f5362680cf2921baf0c3451 25m
```
1. Verify the Big Bang Helm Chart was deployed
@@ -137,14 +137,14 @@ The following commands will help you monitor the progress of the Big Bang deploy
# The Git repository holding the Helm charts for each package can be seen in the URL column.
# The STATUS column shows the branch and tag of the revision being used.
NAMESPACE NAME URL READY STATUS AGE
- bigbang bigbang https://repo1.dsop.io/platform-one/big-bang/umbrella.git True Fetched revision: master/3a44686520152e576a8c2c6f264876efff497c4b 8m25s
- bigbang logging https://repo1.dsop.io/platform-one/big-bang/apps/core/logging.git True Fetched revision: release-v0.2.x/9cfe1e14c12098464ee89eb877614f781cd78fb7 8m23s
- bigbang certmanager https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/cert-manager.git True Fetched revision: release-v1.0.x/1247135baf145dcfad4a4a02ef679c48fb76d9fb 8m23s
- bigbang istio https://repo1.dsop.io/platform-one/big-bang/apps/core/servicemesh.git True Fetched revision: chart-release/2b02a51b7950ce21bac26403fa25d09e7e3f86c3 8m23s
- bigbang twistlock https://repo1.dsop.io/platform-one/big-bang/apps/security-tools/twistlock.git True Fetched revision: chart-release/faf038197291915713e0f213a4e35991e72f73f6 8m23s
- bigbang gatekeeper https://repo1.dsop.io/platform-one/big-bang/apps/core/policy.git True Fetched revision: chart-release/1a5f32c8e7f672c3b5937b604e5f38eaa08ce246 8m23s
- bigbang monitoring https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring.git True Fetched revision: release-v0.2.x/ca60bedcc106b95beb0bf9ccdc6e0e759e6fd6bf 8m23s
- bigbang cluster-auditor https://repo1.dsop.io/platform-one/big-bang/apps/core/cluster-auditor.git True Fetched revision: chart-release/598c35670db0cbdb3a48063b2d558965afe73185 8m23s
+ bigbang bigbang https://repo1.dso.mil/platform-one/big-bang/umbrella.git True Fetched revision: master/3a44686520152e576a8c2c6f264876efff497c4b 8m25s
+ bigbang logging https://repo1.dso.mil/platform-one/big-bang/apps/core/logging.git True Fetched revision: release-v0.2.x/9cfe1e14c12098464ee89eb877614f781cd78fb7 8m23s
+ bigbang certmanager https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/cert-manager.git True Fetched revision: release-v1.0.x/1247135baf145dcfad4a4a02ef679c48fb76d9fb 8m23s
+ bigbang istio https://repo1.dso.mil/platform-one/big-bang/apps/core/servicemesh.git True Fetched revision: chart-release/2b02a51b7950ce21bac26403fa25d09e7e3f86c3 8m23s
+ bigbang twistlock https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock.git True Fetched revision: chart-release/faf038197291915713e0f213a4e35991e72f73f6 8m23s
+ bigbang gatekeeper https://repo1.dso.mil/platform-one/big-bang/apps/core/policy.git True Fetched revision: chart-release/1a5f32c8e7f672c3b5937b604e5f38eaa08ce246 8m23s
+ bigbang monitoring https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git True Fetched revision: release-v0.2.x/ca60bedcc106b95beb0bf9ccdc6e0e759e6fd6bf 8m23s
+ bigbang cluster-auditor https://repo1.dso.mil/platform-one/big-bang/apps/core/cluster-auditor.git True Fetched revision: chart-release/598c35670db0cbdb3a48063b2d558965afe73185 8m23s
```
1. Verify the packages get deployed
diff --git a/docs/b_troubleshooting.md b/docs/b_troubleshooting.md
index c691dd96794cc550fc385ff84c8945cbacaa5d97..33be236c9c75fe6cc020e69aa262b567ad156a0e 100644
--- a/docs/b_troubleshooting.md
+++ b/docs/b_troubleshooting.md
@@ -17,7 +17,7 @@ Big Bang is configured to retry failed package installations and upgrades. Befo
| Symptom | Cause | Resolution |
|--|--|--|
-| Despite entering correct credentials, get `anauthorized: authentication required` from Iron Bank | Using a non-robot account with an expired token | Login with the non-robot account manually at `registry1.dsop.io`, then retry. For production, contact the Iron Bank team to obtain a robot account and update pull credentials to use it in your environment |
+| Despite entering correct credentials, get `anauthorized: authentication required` from Iron Bank | Using a non-robot account with an expired token | Login with the non-robot account manually at `registry1.dso.mil`, then retry. For production, contact the Iron Bank team to obtain a robot account and update pull credentials to use it in your environment |
## Flux install
diff --git a/docs/c_development.md b/docs/c_development.md
index 87f5566a9710ee127ef112c8f6d1e83fc19e8104..bb4925cce7409c270c6ee6cd4a0f62092d98b219 100644
--- a/docs/c_development.md
+++ b/docs/c_development.md
@@ -7,6 +7,9 @@ Included here is a setup that will allow you to checkout and begin development u
### Prequisites
#### Access
++ [AWS GovCloud (US) EC2](https://console.amazonaws-us-gov.com/ec2)
++ [Umbrella repository](https://repo1.dso.mil/platform-one/big-bang/umbrella)
++ [Iron Bank registry](https://registry1.dso.mil/)
- [AWS GovCloud (US) EC2](https://console.amazonaws-us-gov.com/ec2)
- [Umbrella repository](https://repo1.dsop.io/platform-one/big-bang/umbrella)
@@ -199,7 +202,7 @@ mkdir ~/.k3d/
# Create the config file. Use your registry1 credentials. Copy your user name and token secret from your Harbor profile.
cat << EOF > ~/.k3d/p1-registries.yaml
configs:
- "registry1.dsop.io":
+ "registry1.dso.mil":
auth:
username: "user.name"
password: "place_token_secret_here"
@@ -261,7 +264,7 @@ kubectl get nodes
mkdir -pv ~/repos/
cd ~/repos
-git clone https://repo1.dsop.io/platform-one/big-bang/umbrella.git
+git clone https://repo1.dso.mil/platform-one/big-bang/umbrella.git
cd ~/repos/umbrella
```
@@ -279,7 +282,7 @@ kubectl create ns bigbang
```bash
# You will be overriding values in `chart/values.yaml` for development
-# You can use the [Big Bang template's dev ConfigMap](https://repo1.dsop.io/platform-one/big-bang/customers/bigbang/-/blob/template/bigbang/dev/configmap.yaml) to start. This will minimize the resources for deploying BigBang.
+# You can use the [Big Bang template's dev ConfigMap](https://repo1.dso.mil/platform-one/big-bang/customers/bigbang/-/blob/template/bigbang/dev/configmap.yaml) to start. This will minimize the resources for deploying BigBang.
# For convenience, it is also copied here
cat << EOF > my-values.yaml
diff --git a/hack/flux-install.sh b/hack/flux-install.sh
index f2e0c5c1e778d4d76d8fc4fb3c925de014446c8a..f5b7509f69b1f9209f515eb190003ed9588d3f21 100755
--- a/hack/flux-install.sh
+++ b/hack/flux-install.sh
@@ -5,7 +5,7 @@
# After Flux2 is installed, the secret will be removed from the cluster
# Constants
-reg=registry1.dsop.io
+reg=registry1.dso.mil
repo=ironbank/fluxcd
fluxver="v0.2.4"
ns=flux-system
diff --git a/scripts/deploy/01_deploy_bigbang.sh b/scripts/deploy/01_deploy_bigbang.sh
index fc84dec4e6292fa55f82f6f0b04546bd8d6696c4..1f94df3c6a1ed116c5cbda61c335aff25097da75 100755
--- a/scripts/deploy/01_deploy_bigbang.sh
+++ b/scripts/deploy/01_deploy_bigbang.sh
@@ -7,32 +7,33 @@ echo "Installing Flux"
flux --version
flux check --pre
-# Install flux in the cluster
+# create flux namespace
kubectl create ns flux-system || true
-# TODO When changing the flux images to .mil this will need to chagne
+# delete flux private-registry secret
+kubectl delete secret private-registry -n flux-system || true
+
+# create flux private-registry secret
kubectl create secret docker-registry private-registry -n flux-system \
- --docker-server=registry1.dsop.io \
+ --docker-server=registry1.dso.mil \
--docker-username='robot$bigbang' \
--docker-password=${REGISTRY1_PASSWORD} \
--docker-email=bigbang@bigbang.dev || true
+
+# install flux
kubectl apply -f ./scripts/deploy/flux.yaml
-# Wait for flux
-kubectl wait --for=condition=available --timeout 300s -n "flux-system" "deployment/helm-controller"
-kubectl wait --for=condition=available --timeout 300s -n "flux-system" "deployment/source-controller"
+# wait for flux
flux check
-# Deploy BigBang using dev sized scaling
+# deploy BigBang using dev sized scaling
echo "Installing BigBang"
helm upgrade -i bigbang chart -n bigbang --create-namespace \
--set registryCredentials[0].username='robot$bigbang' --set registryCredentials[0].password=${REGISTRY1_PASSWORD} \
---set registryCredentials[0].registry=registry1.dsop.io \
---set registryCredentials[1].username='robot$bigbang' --set registryCredentials[1].password=${REGISTRY1_PASSWORD} \
---set registryCredentials[1].registry=registry1.dso.mil \
+--set registryCredentials[0].registry=registry1.dso.mil \
-f tests/ci/k3d/values.yaml
-## Apply secrets kustomization pointing to current branch
+# apply secrets kustomization pointing to current branch
echo "Deploying secrets from the ${CI_COMMIT_REF_NAME} branch"
if [[ -z "${CI_COMMIT_TAG}" ]]; then
cat tests/ci/shared-secrets.yaml | sed 's|master|'$CI_COMMIT_REF_NAME'|g' | kubectl apply -f -
diff --git a/scripts/deploy/02_wait_for_helmrealeases.sh b/scripts/deploy/02_wait_for_helmrealeases.sh
index 3ef6696f93b89fb2cf3bf78103dbbf7cc27a2c66..d2492913ea9c4e12287169c1d4a711935580b789 100755
--- a/scripts/deploy/02_wait_for_helmrealeases.sh
+++ b/scripts/deploy/02_wait_for_helmrealeases.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
-set -e
+set -ex
## This is an array to instantiate the order of wait conditions
-ORDERED_HELMRELEASES="gatekeeper istio-operator istio monitoring eck-operator ek fluent-bit twistlock cluster-auditor authservice argocd gitlab"
+ORDERED_HELMRELEASES="gatekeeper istio-operator istio monitoring eck-operator ek fluent-bit twistlock cluster-auditor authservice argocd gitlab haproxy-sso"
## This the actual deployed helmrelease objects in the cluster
diff --git a/scripts/deploy/flux.yaml b/scripts/deploy/flux.yaml
index 023ff79ce7099695e49b01c8f6d7e9d4249770c0..ba81d20aab8a0b218d5301bfb471e2f05ff5c9b0 100644
--- a/scripts/deploy/flux.yaml
+++ b/scripts/deploy/flux.yaml
@@ -942,7 +942,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry1.dsop.io/ironbank/fluxcd/source-controller:v0.4.0
+ image: registry1.dso.mil/ironbank/fluxcd/source-controller:v0.4.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -1290,7 +1290,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry1.dsop.io/ironbank/fluxcd/kustomize-controller:v0.4.0
+ image: registry1.dso.mil/ironbank/fluxcd/kustomize-controller:v0.4.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -1774,7 +1774,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry1.dsop.io/ironbank/fluxcd/helm-controller:v0.4.0
+ image: registry1.dso.mil/ironbank/fluxcd/helm-controller:v0.4.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -2350,7 +2350,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry1.dsop.io/ironbank/fluxcd/notification-controller:v0.4.0
+ image: registry1.dso.mil/ironbank/fluxcd/notification-controller:v0.4.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
diff --git a/scripts/package/synker.Dockerfile b/scripts/package/synker.Dockerfile
index bb1a151196a3de7a48028bf45c9fc2217a156cf5..fa6294ef626842f9f5a311de2fa30a04acfc7d30 100644
--- a/scripts/package/synker.Dockerfile
+++ b/scripts/package/synker.Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean
# Clone the latest release of p8kr and built the binrary statically
-RUN git clone https://repo1.dsop.io/platform-one/hagrid/sync.git synker && \
+RUN git clone https://repo1.dso.mil/platform-one/hagrid/sync.git synker && \
cd synker && \
make binary-local-static DISABLE_CGO=1
diff --git a/scripts/package/synker.yaml b/scripts/package/synker.yaml
index c76a0622d4095b9a874b7ef8ee4d86206331a867..4e5aee894da0000dcc90f7a65faa75af091cc062 100644
--- a/scripts/package/synker.yaml
+++ b/scripts/package/synker.yaml
@@ -29,4 +29,4 @@ destination:
source:
authFile: /root/.docker/config.json
images:
- - registry.dsop.io/platform-one/big-bang/apps/security-tools/twistlock/defender:20.04.163
+ - registry.dso.mil/platform-one/big-bang/apps/security-tools/twistlock/defender:20.04.163
diff --git a/tests/ci/shared-secrets.yaml b/tests/ci/shared-secrets.yaml
index f66695b22a9cef69c7b354b9f3e8798e6382da5a..1870a2b6da1fbc6ac914dcd3d330e1792dd215b2 100644
--- a/tests/ci/shared-secrets.yaml
+++ b/tests/ci/shared-secrets.yaml
@@ -20,7 +20,7 @@ spec:
interval: 1m0s
# NOTE: We could use the same "bigbang" repository, but secrets are usually committed to a consumer owned repo,
# so we are demonstrating that here with a new `GitRepository` resource pointed to the same repo
- url: https://repo1.dsop.io/platform-one/big-bang/umbrella.git
+ url: https://repo1.dso.mil/platform-one/big-bang/umbrella.git
ref:
branch: master
---
diff --git a/tests/registries.yaml.template b/tests/registries.yaml.template
index 0af845d0ce58de04b59958729ff68bb63845b921..e5e8fbf6ee954ba27f5798785d8b4b1830b9cece 100644
--- a/tests/registries.yaml.template
+++ b/tests/registries.yaml.template
@@ -1,5 +1,5 @@
configs:
- "registry1.dsop.io":
+ "registry1.dso.mil":
auth:
username: robot${DOLLAR}bigbang
password: ${REGISTRY1_PASSWORD}