fix: update to drop user and add ENV-DOMAIN

infralovers · May 10, 2023 · ce4f6bf · ce4f6bf
1 parent 526b29b
commit ce4f6bf
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 20 deletions.
diff --git a/examples/kubernetes/all-in-one/12-factor-app.yaml b/examples/kubernetes/all-in-one/12-factor-app.yaml
@@ -294,7 +294,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`k8s.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`k8s.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: api
@@ -311,7 +311,7 @@ spec:
   tls:
     certResolver: myresolver
   routes:
-    - match: Host(`k8s.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`k8s.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: api

diff --git a/examples/kubernetes/chaos-engeneering/chaos-ingress.yaml b/examples/kubernetes/chaos-engeneering/chaos-ingress.yaml
@@ -9,7 +9,7 @@ spec:
   tls:
     certResolver: myresolver
   routes:
-    - match: Host(`chaos.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`chaos.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: chaos-dashboard

diff --git a/examples/kubernetes/efk/elastic-ingress.yaml b/examples/kubernetes/efk/elastic-ingress.yaml
@@ -14,7 +14,7 @@ spec:
   tls:
     - secretName: elasticsearch-tls
   rules:
-    - host: elastic.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: elastic.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /
@@ -38,7 +38,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.entrypoints: web
 spec:
   rules:
-    - host: elastic.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: elastic.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /

diff --git a/examples/kubernetes/efk/kibana-ingress.yaml b/examples/kubernetes/efk/kibana-ingress.yaml
@@ -14,7 +14,7 @@ spec:
   tls:
     - secretName: kibana-tls
   rules:
-    - host: kibana.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: kibana.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /
@@ -38,7 +38,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.entrypoints: web
 spec:
   rules:
-    - host: kibana.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: kibana.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /

diff --git a/examples/kubernetes/keptn-lifecycle-toolkit/ingress.yaml b/examples/kubernetes/keptn-lifecycle-toolkit/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`jaeger.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`jaeger.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: jaeger-query
@@ -22,7 +22,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`prom.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`prom.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: prometheus-k8s
@@ -37,7 +37,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: Host(`grafana.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`grafana.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: grafana

diff --git a/examples/kubernetes/prometheus/grafana-ingress.yaml b/examples/kubernetes/prometheus/grafana-ingress.yaml
@@ -8,7 +8,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`grafana.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`grafana.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: prometheus-grafana
@@ -25,7 +25,7 @@ spec:
   tls:
     certResolver: myresolver
   routes:
-    - match: Host(`grafana.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`grafana.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: prometheus-grafana

diff --git a/examples/kubernetes/prometheus/prometheus-ingress.yaml b/examples/kubernetes/prometheus/prometheus-ingress.yaml
@@ -6,7 +6,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.entrypoints: web
 spec:
   rules:
-    - host: prom.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: prom.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /
@@ -25,7 +25,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
 spec:
   rules:
-    - host: prom.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training
+    - host: prom.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>
       http:
         paths:
           - path: /

diff --git a/examples/kubernetes/tracing/jaeger-ingress.yaml b/examples/kubernetes/tracing/jaeger-ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`jaeger.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`jaeger.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: simplest-query
@@ -24,7 +24,7 @@ spec:
   tls:
     certResolver: myresolver
   routes:
-    - match: Host(`jaeger.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`jaeger.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: simplest-query

diff --git a/examples/kubernetes/traefik/traefik-ingress.yaml b/examples/kubernetes/traefik/traefik-ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`traefik.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix('/dashboard')
+    - match: Host(`traefik.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix('/dashboard')
       kind: Rule
       services:
       - name: traefik-dashboard
@@ -24,7 +24,7 @@ spec:
     - web
   routes:
     - kind: Rule
-      match: Host(`traefik.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/metrics`)
+      match: Host(`traefik.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/metrics`)
       services:
         - name: prometheus@internal
           kind: TraefikService
diff --git a/examples/whoami/whoami.yaml b/examples/whoami/whoami.yaml
@@ -51,7 +51,7 @@ spec:
   tls:
     certResolver: myresolver
   routes:
-    - match: Host(`whoami.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`whoami.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: whoami
@@ -65,7 +65,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`whoami.<ENV-NAME>-user-<ENV-USER-ID>-01.<ENV-ANIMAL>.commandemy.training`) && PathPrefix(`/`)
+    - match: Host(`whoami.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
         - name: whoami

diff --git a/replace-variables.sh b/replace-variables.sh
@@ -11,3 +11,6 @@ find examples* -type f -exec sed -i -e "s/<ENV-IP>/$HOST_IP/g" {} \;
 
 # Replace <ENV-NAME>
 find examples* -type f -exec sed -i -e "s/<ENV-NAME>/$ENVIRONMENT/g" {} \;
+
+# Replace <ENV-DOMAIN>
+find examples* -type f -exec sed -i -e "s/<ENV-DOMAIN>/$DOMAIN/g" {} \;