Merge pull request aws-samples#18 from elamaran11/feature/Yelb-app

Feature/yelb app
mblabs-tech · Aug 23, 2022 · a2f60f6 · a2f60f6
2 parents d6ab922 + 1dc0cc0
commit a2f60f6
Show file tree

Hide file tree

Showing 19 changed files with 157 additions and 6 deletions.
diff --git a/envs/prod/templates/team-geordie.yaml b/envs/prod/templates/team-geordie.yaml
@@ -14,6 +14,10 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/prod
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
     automated:
       prune: true

diff --git a/teams/team-geordie/dev/ho11y/templates/ho11y.yaml b/teams/team-geordie/dev/ho11y/templates/ho11y.yaml
@@ -152,4 +152,4 @@ spec:
     targetPort: 8765
   selector:
     app: downstream1
----
+---
diff --git a/teams/team-geordie/dev/ho11y/templates/ingress.yaml b/teams/team-geordie/dev/ho11y/templates/ingress.yaml
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: ho11y-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+spec:
+  rules:
+  - host: ho11y.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: frontend
+            port: 
+              number: 80
diff --git a/teams/team-geordie/dev/templates/ho11y-app.yaml b/teams/team-geordie/dev/templates/ho11y-app.yaml
@@ -14,8 +14,12 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/dev/ho11y
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
-    automated:
+    automated: 
       prune: true
     syncOptions:
     - CreateNamespace=true
diff --git a/teams/team-geordie/dev/templates/yelb-app.yaml b/teams/team-geordie/dev/templates/yelb-app.yaml
@@ -14,6 +14,10 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/dev/yelb
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
     automated:
       prune: true

diff --git a/teams/team-geordie/dev/yelb/templates/deployment.yaml b/teams/team-geordie/dev/yelb/templates/deployment.yaml
@@ -155,3 +155,4 @@ spec:
           image: mreferre/yelb-appserver:0.5
           ports:
             - containerPort: 4567
+---
diff --git a/teams/team-geordie/dev/yelb/templates/ingress.yaml b/teams/team-geordie/dev/yelb/templates/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: yelb-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+  labels:
+    app: yelb-ui
+spec:
+  rules:
+  - host: yelb.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: yelb-ui
+            port: 
+              number: 80
diff --git a/teams/team-geordie/prod/ho11y/templates/ho11y.yaml b/teams/team-geordie/prod/ho11y/templates/ho11y.yaml
@@ -152,4 +152,4 @@ spec:
     targetPort: 8765
   selector:
     app: downstream1
----
+---
diff --git a/teams/team-geordie/prod/ho11y/templates/ingress.yaml b/teams/team-geordie/prod/ho11y/templates/ingress.yaml
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: ho11y-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+spec:
+  rules:
+  - host: ho11y.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: frontend
+            port: 
+              number: 80
diff --git a/teams/team-geordie/prod/templates/ho11y-app.yaml b/teams/team-geordie/prod/templates/ho11y-app.yaml
@@ -14,8 +14,12 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/prod/ho11y
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
-    automated:
+    automated: 
       prune: true
     syncOptions:
     - CreateNamespace=true
diff --git a/teams/team-geordie/prod/templates/yelb-app.yaml b/teams/team-geordie/prod/templates/yelb-app.yaml
@@ -14,6 +14,10 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/prod/yelb
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
     automated:
       prune: true

diff --git a/teams/team-geordie/prod/yelb/templates/deployment.yaml b/teams/team-geordie/prod/yelb/templates/deployment.yaml
@@ -155,3 +155,4 @@ spec:
           image: mreferre/yelb-appserver:0.5
           ports:
             - containerPort: 4567
+---
diff --git a/teams/team-geordie/prod/yelb/templates/ingress.yaml b/teams/team-geordie/prod/yelb/templates/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: yelb-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+  labels:
+    app: yelb-ui
+spec:
+  rules:
+  - host: yelb.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: yelb-ui
+            port: 
+              number: 80
diff --git a/teams/team-geordie/test/ho11y/templates/ho11y.yaml b/teams/team-geordie/test/ho11y/templates/ho11y.yaml
@@ -152,4 +152,4 @@ spec:
     targetPort: 8765
   selector:
     app: downstream1
----
+---
diff --git a/teams/team-geordie/test/ho11y/templates/ingress.yaml b/teams/team-geordie/test/ho11y/templates/ingress.yaml
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: ho11y-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+spec:
+  rules:
+  - host: ho11y.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: frontend
+            port: 
+              number: 80
diff --git a/teams/team-geordie/test/templates/ho11y-app.yaml b/teams/team-geordie/test/templates/ho11y-app.yaml
@@ -14,8 +14,12 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/test/ho11y
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
-    automated:
+    automated: 
       prune: true
     syncOptions:
     - CreateNamespace=true
diff --git a/teams/team-geordie/test/templates/yelb-app.yaml b/teams/team-geordie/test/templates/yelb-app.yaml
@@ -14,6 +14,10 @@ spec:
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
     path: teams/team-geordie/test/yelb
+    helm:
+      parameters:
+      - name: spec.ingress.host
+        value: {{ .Values.spec.ingress.host }}
   syncPolicy:
     automated:
       prune: true

diff --git a/teams/team-geordie/test/yelb/templates/deployment.yaml b/teams/team-geordie/test/yelb/templates/deployment.yaml
@@ -155,3 +155,4 @@ spec:
           image: mreferre/yelb-appserver:0.5
           ports:
             - containerPort: 4567
+---
diff --git a/teams/team-geordie/test/yelb/templates/ingress.yaml b/teams/team-geordie/test/yelb/templates/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: geordie
+  name: yelb-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+  labels:
+    app: yelb-ui
+spec:
+  rules:
+  - host: yelb.{{ .Values.spec.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: yelb-ui
+            port: 
+              number: 80
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,3 +155,4 @@ spec: @@
               image: mreferre/yelb-appserver:0.5
               ports:
                 - containerPort: 4567
+    ---