diff --git a/charts/matrix-hookshot/Chart.yaml b/charts/matrix-hookshot/Chart.yaml index 4f83284..a6c88ba 100644 --- a/charts/matrix-hookshot/Chart.yaml +++ b/charts/matrix-hookshot/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: matrix-hookshot -version: 0.0.8 +version: 0.0.9 description: Chart for Matrix Hookshot keywords: - matrix diff --git a/charts/matrix-hookshot/templates/deployment.yaml b/charts/matrix-hookshot/templates/deployment.yaml index 77a8cf4..d915a53 100644 --- a/charts/matrix-hookshot/templates/deployment.yaml +++ b/charts/matrix-hookshot/templates/deployment.yaml @@ -40,6 +40,9 @@ spec: - name: appservice containerPort: {{ .Values.service.appservice.port }} protocol: TCP + - name: widgets + containerPort: {{ .Values.service.widgets.port }} + protocol: TCP env: {{- range $k,$v := .Values.deployment.env }} - name: {{ $k }} diff --git a/charts/matrix-hookshot/templates/ingress.yaml b/charts/matrix-hookshot/templates/ingress.yaml index 302178d..26c702a 100644 --- a/charts/matrix-hookshot/templates/ingress.yaml +++ b/charts/matrix-hookshot/templates/ingress.yaml @@ -64,3 +64,37 @@ spec: port: name: appservice {{- end }} + +--- +{{- if .Values.ingress.widgets.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: matrix-hookshot-widgets + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: matrix-hookshot-widgets + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: web + app.kubernetes.io/part-of: {{ .Release.Name }} + annotations: + {{- toYaml .Values.ingress.widgets.annotations | nindent 4 }} +spec: + ingressClassName: {{ .Values.ingress.widgets.className }} + tls: + - hosts: + - {{ .Values.ingress.widgets.host }} + secretName: {{ .Release.Name }}-widgets-secret-tls + rules: + - host: {{ .Values.ingress.widgets.host }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ .Release.Name }} + port: + name: widgets +{{- end }} diff --git a/charts/matrix-hookshot/templates/service.yaml b/charts/matrix-hookshot/templates/service.yaml index 3732da4..f69bbae 100644 --- a/charts/matrix-hookshot/templates/service.yaml +++ b/charts/matrix-hookshot/templates/service.yaml @@ -24,6 +24,10 @@ spec: targetPort: appservice protocol: TCP name: appservice + - port: {{ .Values.service.widgets.port }} + targetPort: widgets + protocol: TCP + name: widgets selector: app.kubernetes.io/name: matrix-hookshot app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/matrix-hookshot/values.yaml b/charts/matrix-hookshot/values.yaml index 03c0bef..480043c 100644 --- a/charts/matrix-hookshot/values.yaml +++ b/charts/matrix-hookshot/values.yaml @@ -22,6 +22,8 @@ service: port: 9001 appservice: port: 9002 + widgets: + port: 9003 ingress: webhook: enabled: false @@ -33,6 +35,11 @@ ingress: className: "" annotations: {} host: "" + widgets: + enabled: false + className: "" + annotations: {} + host: "" metrics: enabled: false serviceMonitor: @@ -69,7 +76,7 @@ hookshot: resources: - metrics - provisioning - - port: 9002 + - port: 9003 bindAddress: 0.0.0.0 resources: - widgets