Merge branch 'update-dns-references' into 'main'

update bigbang.dev -> dev.bigbang.mil references in setup Closes #93 See merge request big-bang/customers/template!97
DoD-Platform-One · Aug 13, 2024 · 9eeeb2d · 9eeeb2d
2 parents f2d729a + 420a8f2
commit 9eeeb2d
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 172 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -195,7 +195,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - Fix namespace error (istio-system) when deploying wildcard-cert
-- Updated expired certificate for *.bigbang.dev
+- Updated expired certificate for *.dev.bigbang.mil
 - Added default values for `istio.ingress.tls.*` to workaround Helm error on `nil` values.
 - Updated [README.md](./README.md) for TLS cert
 - Updated [README.md](./README.md) for sops key creation (Issue #8)

diff --git a/README.md b/README.md
@@ -207,7 +207,7 @@ git push --set-upstream origin template-demo
 
 ### Add TLS Certificates
 
-The `base/configmap.yaml` is setup to use the domain `bigbang.dev` by default. (Which results in sites that look like this: `https://*.bigbang.dev`) A demo TLS wildcard certificate is provided in `base/bigbang-dev-cert.yaml` to use.
+The `base/configmap.yaml` is setup to use the domain `dev.bigbang.mil` by default. (Which results in sites that look like this: `https://*.dev.bigbang.mil`) A demo TLS wildcard certificate is provided in `base/bigbang-dev-cert.yaml` to use.
 
 #### Important Security Note
 
@@ -225,7 +225,7 @@ sops -e bigbang-dev-cert.yaml > secrets.enc.yaml
 
 # Save encrypted TLS certificate into Git
 git add secrets.enc.yaml
-git commit -m "chore: add bigbang.dev tls certificates"
+git commit -m "chore: add dev.bigbang.mil tls certificates"
 git push
 ```
 
@@ -499,9 +499,9 @@ Big Bang follows a [GitOps](https://www.weave.works/blog/what-is-gitops-really)
    # Watch deployment
    watch kubectl get hr,po -A
 
-   # Test deployment by opening a browser to "kiali.bigbang.dev" to get to the Kiali application deployed by Istio.
-   # Note that the owner of "bigbang.dev" has setup the domain to point to 127.0.0.1 for this type of testing.
-   # If you are deployed on a remote host you will need to point "kiali.bigbang.dev" to your cluster master node via your /etc/hosts file
+   # Test deployment by opening a browser to "kiali.dev.bigbang.mil" to get to the Kiali application deployed by Istio.
+   # Note that the owner of "dev.bigbang.mil" has setup the domain to point to 127.0.0.1 for this type of testing.
+   # If you are deployed on a remote host you will need to point "kiali.dev.bigbang.mil" to your cluster master node via your /etc/hosts file
    ```
 
    > If you cannot get to the main page of Kiali, it may be due to an expired certificate.  Check the expiration of the certificate in `base/configmap.yaml`.
@@ -535,7 +535,7 @@ You now have successfully deployed Big Bang.  Your next step is to customize the
    # Watch deployment for twistlock to be deployed
    watch kubectl get hr,po -A
 
-   # Test deployment by opening a browser to "twistlock.bigbang.dev" to get to the Twistlock application
+   # Test deployment by opening a browser to "twistlock.dev.bigbang.mil" to get to the Twistlock application
    ```
 
 ### Update the Big Bang Version
@@ -585,7 +585,7 @@ When you are done testing, you can update the reference in `base` (and delete th
 
 ### Update the domain
 
-Big Bang deploys applications to `*.bigbang.dev` by default.  You can override the `bigbang.dev` domain to your domain by updating `base/configmap.yaml` and adding the following:
+Big Bang deploys applications to `*.dev.bigbang.mil` by default.  You can override the `dev.bigbang.mil` domain to your domain by updating `base/configmap.yaml` and adding the following:
 
 ```yaml
 domain: insert-your-domain-here

diff --git a/base/bigbang-dev-cert.yaml b/base/bigbang-dev-cert.yaml
@@ -3,131 +3,63 @@ kind: Secret
 metadata:
   name: common-bb
 stringData:
-  # TLS key pair for *.bigbang.dev is used as an example for demo purposes
+  # TLS key pair for *.dev.bigbang.mil is used as an example for demo purposes
   values.yaml: |-
     istio:
       gateways:
         public:
           tls:
             key: |
               -----BEGIN PRIVATE KEY-----
-              MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDvKUzWiZucm6/
-              8D2Nx4KVe8t6uHtARpw112f4yGv7xKcOJkbxLbVtor8pj/HS5tRSZq2ziIQl9y98
-              8TVAOBezgzPPMDxOqDeyHl5gAtqzpK/eSPmueZIhR88BH2+SMYqa5kxmjn752Rf0
-              jVeCrVdQ5MD9rqA00oQi/zO+gQQoz6QSuiEQ2pSKYB3gv9oIoJorIU1n4qLYAezn
-              TvFwjmKWPPhRdyslpcAi1rVO+mVX3Y2DKU/CfpWNFVVT+H788Srn4yP6iWUymfQU
-              vHOXII1erMnES2H9BDffumrRf3m3IpgueQ3vPhB8ftjFZozURj2t/WSeaKsyQSoZ
-              Wr99DWxpAgMBAAECggEAAW8ARsACSAzOgtlfmgo8Cpw9gUiYnn/l5P8O4+OT5uQp
-              1RCytFGBYqwuej9zpffK1k+qNgZp8V0+G8wod6/xfH8Zggr4ZhsVTVirmEhtEaPD
-              Jf2i1oRNbbD48yknyApU2Y2WQaoJhArzAfeHDI34db83KqR8x+ZC0X7NAjgvr5zS
-              b0OfY2tht4oxEWh2m67FzlFgF+cWyszRYyfvHfOFBqLesuCnSfMoOzmbT3SlnxHo
-              6GSa1e/kCJVzFJNb74BZTIH0w6Ar/a0QG829VXivqj8lRENU/1xUI2JhNz4RdH7F
-              6MeiwQbq4pWjHfh4djuzQFIwOgCnSNRnNuNywOVuAQKBgQDjleEI1XFQawXmHtHu
-              6GMhbgptRoSUyutDDdo2MHGvDbxDOIsczIBjxCuYAM47nmGMuWbDJUN+2VQAX32J
-              WZagRxWikxnEqv3B7No7tLSQ42rRo/tDBrZPCCuS9u/ZJM4o7MCa/VzTtbicGOCh
-              bTIoTeEtT2piIdkrjHFGGlYOLQKBgQDcLNFHrSJCkHfCoz75+zytfYan+2dIxuV/
-              MlnrT8XHt33cst4ZwoIQbsE6mv7J4CJqOgUYDvoJpioLV3InUACDxXd+bVY7RwxP
-              j25pXzYL++RctVO3IEOCmFkwlq0fNFdrOn8Y/cnRTwd2e60n08rCKgJS8KhEAaO0
-              QvVmAHw4rQKBgQDL7hCAnunzuoLFqpZI8tlpKjaTpp3EynO3WSFQb2ZfCvrIbVFS
-              U/kz7KN3iDlEeO5GcBeiA7EQaGN6FhbiTXHIWwoK7K8paGMMM1V2LL2kGvQruDm8
-              3LXd6Z9KCJXxSKanS0ZnW2KjnnE3Bp+6ZqOMNATzWfckydnUyPrza0PzXQKBgEYS
-              1YCUb8Tzqcn+nrp85XDp9INeFh8pfj0fT1L/DpljouEs5Fcaer60ITd/wPuLJCje
-              0mQ30AhmJBd7+07bvW4y2LcaIUm4cQiZQ7CxpsfloWaIJ16vHA1iY3B9ZBf8Vp4/
-              /dd8XlEJb/ybnB6C35MwP5EaGtOaGfnzHZsbKG35AoGAWm9tpqhuldQ3MCvoAr5Q
-              b42JLSKqwpvVjQDiFZPI/0wZTo3WkWm9Rd7CAACheb8S70K1r/JIzsmIcnj0v4xs
-              sfd+R35UE+m8MExbDP4lKFParmvi2/UZfb3VFNMmMPTV6AEIBl6N4PmhHMZOsIRs
-              H4RxbE+FpmsMAUCpdrzvFkc=
+              MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgsXVkLDNhQK9xR0FV
+              VsHqAv2x7vE9pWbVGBn2SGm/r9mhRANCAAQaaaKYJWVVPTskEUoVVpZ4kNppCqqL
+              hneVmSc8WCyvYlnl9U2b1VXfjTNQB7ZuDa+7qAi8++uV1m/20PcoUY4/
               -----END PRIVATE KEY-----
             cert: |
               -----BEGIN CERTIFICATE-----
-              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
-              imbt/HYVhe8WfukQ/kQdlhsHCw==
+              MIIDhDCCAwqgAwIBAgISBJIpwB8WyZ6FGn9MfGNa2zwIMAoGCCqGSM49BAMDMDIx
+              CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
+              NTAeFw0yNDA2MTAxOTA3NTZaFw0yNDA5MDgxOTA3NTVaMBwxGjAYBgNVBAMMESou
+              ZGV2LmJpZ2JhbmcubWlsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGmmimCVl
+              VT07JBFKFVaWeJDaaQqqi4Z3lZknPFgsr2JZ5fVNm9VV340zUAe2bg2vu6gIvPvr
+              ldZv9tD3KFGOP6OCAhQwggIQMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAUBggr
+              BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUMyRxWwGL
+              Q209ye3mgz4hsvvPJRQwHwYDVR0jBBgwFoAUnytfzzwhT50Et+0rLMTGcIvS1w0w
+              VQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vZTUuby5sZW5jci5v
+              cmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNS5pLmxlbmNyLm9yZy8wHAYDVR0RBBUw
+              E4IRKi5kZXYuYmlnYmFuZy5taWwwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEFBgor
+              BgEEAdZ5AgQCBIH2BIHzAPEAdgBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+r
+              OdiEcwAAAZADw7e1AAAEAwBHMEUCIQCi1R01acRa3rZYZRqWz5FZL6mPeVfviYED
+              uvFKcpjrGAIgZqm9FFPi5uxsA1WbAqBp5q+kLqwQeYJryuNcouBHM5oAdwDuzdBk
+              1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAZADw7e4AAAEAwBIMEYCIQCD
+              esnpzmvPV0uTfo0JB7fcdX8XDbJ76rt2fw4bapEN5AIhAJhwg//zwzIGXvulnERl
+              Mt+R0XUjsCdsFL2u3myURmDKMAoGCCqGSM49BAMDA2gAMGUCMQC5YjOycuXsBmTB
+              gjIcnvwyblQ1qqxz6U/WRJHToVw8rt2p4BdMj5uOBONvOMDaTvsCMHQSEBb+QyGc
+              HpfQOw3pyd7pOKt5cRwe8RwSLCwR4NjQFEZDgUxPOrI/3gh9aDkcKQ==
               -----END CERTIFICATE-----
               -----BEGIN CERTIFICATE-----
-              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
+              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
-              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
-              nLRbwHOoq7hHwg==
-              -----END CERTIFICATE-----
-              -----BEGIN CERTIFICATE-----
-              MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
-              MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-              DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
-              TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-              cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
-              AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
-              ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
-              wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
-              LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
-              4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
-              bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
-              sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
-              Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
-              FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
-              SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
-              PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
-              TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-              SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
-              c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
-              +tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
-              ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
-              b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
-              U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
-              MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
-              5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
-              9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
-              WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
-              he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
-              Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
-              -----END CERTIFICATE-----
-                  
+              cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
+              WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+              RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK
+              a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO
+              VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw
+              gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+              ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw
+              i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+              AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
+              BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
+              Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
+              2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
+              bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
+              6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
+              XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
+              koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
+              cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
+              E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
+              K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
+              GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
+              sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
+              VQD9F6Na/+zmXCc=
+              -----END CERTIFICATE-----                 
diff --git a/base/configmap.yaml b/base/configmap.yaml
@@ -1 +1 @@
-domain: bigbang.dev
+domain: dev.bigbang.mil
diff --git a/base/helmrepo.yaml b/base/helmrepo.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: registry1

diff --git a/base/kustomization.yaml b/base/kustomization.yaml
@@ -1,19 +1,21 @@
 # When updating the version of BigBang, make sure to update
 #   both the bases reference and the GitRepository reference
-bases:
-- https://repo1.dso.mil/platform-one/big-bang/bigbang.git/base?ref=2.33.0
 # - helmrepo.yaml
 # - cosignsecret.yaml
 configMapGenerator:
-  - name: common
-    behavior: merge
-    files:
-      - values.yaml=configmap.yaml
-patchesStrategicMerge:
-- secrets.enc.yaml
+- behavior: merge
+  files:
+  - values.yaml=configmap.yaml
+  name: common
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- https://repo1.dso.mil/platform-one/big-bang/bigbang.git/base?ref=2.33.0
+patches:
+- patch: secrets.enc.yaml
 # Enable this section if you wish to use the OCI HelmRepo with Cosign Verfiy instead of the GitRepository.
 # - |-
-#   apiVersion: helm.toolkit.fluxcd.io/v2beta2
+#   apiVersion: helm.toolkit.fluxcd.io/v2
 #   kind: HelmRelease
 #   metadata:
 #     name: bigbang

diff --git a/package-strategy/configmap.yaml b/package-strategy/configmap.yaml
@@ -1,4 +1,4 @@
-domain: bigbang.dev
+domain: dev.bigbang.mil
 
 # Uncomment the following settings if using the AWS RKE2 terraform setup
 # istio:

diff --git a/package-strategy/kustomization.yaml b/package-strategy/kustomization.yaml
@@ -1,28 +1,31 @@
-bases:
-- ../base
 configMapGenerator:
-  - name: environment
-    behavior: merge
-    files:
-      - values.yaml=configmap.yaml
-patchesStrategicMerge:
-## Enable the line below if a secrets.enc.yaml is created in this directory
-# - secrets.enc.yaml
-- |-
-  apiVersion: source.toolkit.fluxcd.io/v1
-  kind: GitRepository
-  metadata:
-    name: bigbang
-  spec:
-    interval: 1m
-# Use the following three lines to test a new version of Big Bang without affecting other environments
-#    ref:
-#      $patch: replace
-#      tag: "2.33.0"
-- |-
-  apiVersion: helm.toolkit.fluxcd.io/v2beta2
-  kind: HelmRelease
-  metadata:
-    name: bigbang
-  spec:
-    interval: 1m
+- behavior: merge
+  files:
+  - values.yaml=configmap.yaml
+  name: environment
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../base
+patches:
+# # Enable the line below if a secrets.enc.yaml is created in this directory
+# - path: secrets.enc.yaml
+- patch: |-
+    apiVersion: source.toolkit.fluxcd.io/v1
+    kind: GitRepository
+    metadata:
+      name: bigbang
+    spec:
+      interval: 1m
+  # Use the following three lines to test a new version of Big Bang without affecting other environments
+  #   ref:
+  #     $patch: replace
+  #     tag: "2.33.0"
+- patch: |-
+    apiVersion: helm.toolkit.fluxcd.io/v2
+    kind: HelmRelease
+    metadata:
+      name: bigbang
+    spec:
+      interval: 1m
diff --git a/terraform/README.md b/terraform/README.md
@@ -285,7 +285,7 @@ export ELBIP=`dig $LBDNS +short | head -1`
 
 # Now add the hostname of the web application into /etc/hosts (or `C:\Windows\System32\drivers\etc\hosts` on Windows)
 # You may need to log out and back into for hosts to take effect
-printf "\nAdd the following line to /etc/hosts to alias Big Bang core products:\n${ELBIP}    twistlock.bigbang.dev kibana.bigbang.dev prometheus.bigbang.dev grafana.bigbang.dev tracing.bigbang.dev kiali.bigbang.dev alertmanager.bigbang.dev\n\n"
+printf "\nAdd the following line to /etc/hosts to alias Big Bang core products:\n${ELBIP}    twistlock.dev.bigbang.mil kibana.dev.bigbang.mil prometheus.dev.bigbang.mil grafana.dev.bigbang.mil tracing.dev.bigbang.mil kiali.dev.bigbang.mil alertmanager.dev.bigbang.mil\n\n"
 ```
 
 ## Terraform Destroy

diff --git a/umbrella-strategy/configmap.yaml b/umbrella-strategy/configmap.yaml
@@ -1 +1 @@
-domain: bigbang.dso.mil
+domain: dev.bigbang.mil