Added new

opszero · Dec 16, 2022 · a54cce3 · a54cce3
1 parent b6c7415
commit a54cce3
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -59,6 +59,19 @@ envRaw: # Additional environment variables added.
       fieldRef:
         fieldPath: status.hostIP
 
+externals:
+  - name: sitemap
+    type: ExternalName
+    cname: "some-sitemap.s3.amazon.com"
+    ingress:
+      hosts:
+        - host: somesitemap.shopcanal.com
+          paths: ["/"]
+          port: 8000
+  - name: elasticache
+    type: ExternalName
+    cname: "elasticache.redis.amazon.com"
+
 apps:
   - name: sitemap
     service:
@@ -78,18 +91,23 @@ apps:
         - name: http
           port: 3000
           protocol: TCP
-      hosts:
-        - host: yieldpayroll.com
-          paths: ["/"]
+        - name: com
+          port: 4000
+          protocol: TCP
+      ingress:
+        annotations:
+          nginx.ingress.kubernetes.io/rewrite-target: /$1
+        hosts:
+          - host: yieldpayroll.com
+            paths: ["/"]
+            port: 3000
       resources:
         requests:
           memory: "64Mi"
           cpu: "250m"
         limits:
           memory: "128Mi"
           cpu: "500m"
-      ingressAnnotations:
-        nginx.ingress.kubernetes.io/rewrite-target: /$1
       autoscaling:
         enabled: true
         minReplicas: 2
@@ -125,9 +143,11 @@ apps:
           port: 3000
           protocol: TCP
       command: ["bundle", "exec", "rails", "server"]
-      hosts:
-        - host: yieldpayroll.com
-          paths: ["/"]
+      ingress:
+        hosts:
+          - host: yieldpayroll.com
+            paths: ["/"]
+            port: 3000
       healthChecks:
         lifecycle:
           preStop:

diff --git a/charts/tiphys/Chart.yaml b/charts/tiphys/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tiphys
 description: A High Level Helm Chart
 type: application
-version: 0.8.0
+version: 0.9.0
 appVersion: 1.16.0
 
 dependencies:

diff --git a/charts/tiphys/templates/app.yaml b/charts/tiphys/templates/app.yaml
@@ -46,7 +46,7 @@ kind: Service
 metadata:
   name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
   labels:
-    {{- include "opszero.selectorLabels" $ | nindent 4 }}-{{ $app.name }}
+    {{- include "opszero.labels" $ | nindent 4 }}-{{ $app.name }}
 spec:
   type: {{ $app.service.type }}
   selector:
@@ -61,7 +61,6 @@ spec:
   {{- end }}
 {{- end }}
 
-{{- if ne $app.service.type "ExternalName" }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -134,7 +133,6 @@ spec:
           {{- with $app.service.healthChecks }}
           {{ toYaml . | nindent 10 }}
           {{- end }}
-{{- end }}
 
 {{- if $app.secrets }}
 ---
@@ -182,7 +180,7 @@ spec:
 {{- end }}
 {{- end }}
 
-{{- with $app.service.hosts }}
+{{- if and $app.service.ingress $app.service.ingress.hosts}}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -200,13 +198,17 @@ metadata:
   {{- with $.Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with $app.service.ingressAnnotations }}
+  {{ if $app.service.ingress }}
+  {{- with $app.service.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- end }}
 spec:
   ingressClassName: nginx
   rules:
-    {{- range $app.service.hosts }}
+    {{- with $app.service.ingress }}
+    {{- with $app.service.ingress.hosts }}
+    {{- range $host := . }}
     - host: {{ .host | quote }}
       http:
         paths:
@@ -216,15 +218,15 @@ spec:
             backend:
               service:
                 name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
-                {{- if ne $app.service.type "ExternalName" }}
                 port:
-                  number: {{ $app.service.port }}
-                {{- end }}
+                  number: {{ $host.port }}
           {{- end }}
     {{- end }}
+    {{- end }}
+    {{- end }}
   tls:
     - hosts:
-    {{- range $app.service.hosts }}
+    {{- range $app.service.ingress.hosts }}
         - {{ .host }}
     {{- end }}
       secretName: {{ include "opszero.fullname" $ }}-{{ $app.name }}-tls

diff --git a/charts/tiphys/templates/externals.yaml b/charts/tiphys/templates/externals.yaml
@@ -0,0 +1,60 @@
+{{- range $app := .Values.externals }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
+  labels:
+    {{- include "opszero.labels" $ | nindent 4 }}-{{ $app.name }}
+spec:
+  type: ExternalName
+  selector:
+    {{- include "opszero.selectorLabels" $ | nindent 4 }}-{{ $app.name }}
+  externalName: {{ $app.cname }}
+
+{{- if $app.ingress }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
+  labels:
+    {{- include "opszero.labels" $ | nindent 4 }}
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "120"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "120"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "120"
+    nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "120"
+    nginx.ingress.kubernetes.io/proxy-body-size: "128m"
+  {{- with $.Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $app.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: nginx
+  rules:
+    {{- with $app.ingress.hosts }}
+    {{- range $host := . }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ . | quote }}
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
+          {{- end }}
+    {{- end }}
+    {{- end }}
+  tls:
+    - hosts:
+    {{- range $app.ingress.hosts }}
+        - {{ .host }}
+    {{- end }}
+      secretName: {{ include "opszero.fullname" $ }}-{{ $app.name }}-tls
+{{- end -}}
+{{- end }}
diff --git a/charts/tiphys/values.yaml b/charts/tiphys/values.yaml
@@ -58,3 +58,6 @@ redis:
   enabled: false
   auth:
     enabled: false
+
+apps: {}
+externals: {}