Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(sawtooth): add ingress capability
Signed-off-by: Kevin O'Donnell <kevin@blockchaintp.com>
- Loading branch information
1 parent
67f6212
commit 1fe012a
Showing
4 changed files
with
176 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| {{/* | ||
| include "ingress" (dict "ingressName" "myingress" "ingress" path.to.ingress "serviceName" "the-service" "servicePort" 9090 "context" $) | ||
| ingress: | ||
| enabled: true | ||
| certManager: false | ||
| pathType: ImplementationSpecific | ||
| apiVersion: "" | ||
| hostname: theservice.local | ||
| path: / | ||
| annotations: {} | ||
| tls: false | ||
| extraHosts: [] | ||
| extraPaths: [] | ||
| extraTls: [] | ||
| secrets: [] | ||
| */}} | ||
| {{- define "lib.ingress" -}} | ||
| {{- $ctx := .context -}} | ||
| {{- $ingressName := .ingressName -}} | ||
| {{- $serviceName := .serviceName -}} | ||
| {{- $servicePort := .servicePort -}} | ||
| {{- if .ingress.enabled -}} | ||
| apiVersion: {{ include "common.capabilities.ingress.apiVersion" $ctx }} | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ $ingressName }} | ||
| namespace: {{ $ctx.Release.Namespace | quote }} | ||
| labels: {{- include "common.labels.standard" $ctx | nindent 4 }} | ||
| {{- if $ctx.Values.commonLabels }} | ||
| {{- include "common.tplvalues.render" ( dict "value" $ctx.Values.commonLabels "context" $ctx ) | nindent 4 }} | ||
| {{- end }} | ||
| annotations: | ||
| {{- if .ingress.certManager }} | ||
| kubernetes.io/tls-acme: "true" | ||
| {{- end }} | ||
| {{- if .ingress.annotations }} | ||
| {{- include "common.tplvalues.render" ( dict "value" .ingress.annotations "context" $ctx ) | nindent 4 }} | ||
| {{- end }} | ||
| {{- if $ctx.Values.commonAnnotations }} | ||
| {{- include "common.tplvalues.render" ( dict "value" $ctx.Values.commonAnnotations "context" $ctx ) | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| rules: | ||
| {{- if .ingress.hostname }} | ||
| - host: {{ .ingress.hostname }} | ||
| http: | ||
| paths: | ||
| {{- if .ingress.extraPaths }} | ||
| {{- toYaml .ingress.extraPaths | nindent 10 }} | ||
| {{- end }} | ||
| - path: {{ .ingress.path }} | ||
| {{- if eq "true" (include "common.ingress.supportsPathType" $ctx) }} | ||
| pathType: {{ .ingress.pathType }} | ||
| {{- end }} | ||
| backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $ctx) | nindent 14 }} | ||
| {{- end }} | ||
| {{- range .ingress.extraHosts }} | ||
| - host: {{ .name | quote }} | ||
| http: | ||
| paths: | ||
| - path: {{ default "/" .path }} | ||
| {{- if eq "true" (include "common.ingress.supportsPathType" $ctx) }} | ||
| pathType: {{ default "ImplementationSpecific" .pathType }} | ||
| {{- end }} | ||
| backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $ctx) | nindent 14 }} | ||
| {{- end }} | ||
| {{- if or .ingress.tls .ingress.extraTls }} | ||
| tls: | ||
| {{- if .ingress.tls }} | ||
| - hosts: | ||
| - {{ .ingress.hostname }} | ||
| secretName: {{ printf "%s-tls" .ingress.hostname }} | ||
| {{- end }} | ||
| {{- if .ingress.extraTls }} | ||
| {{- include "common.tplvalues.render" ( dict "value" .ingress.extraTls "context" $ctx ) | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end -}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| {{- if .Values.ingress.enabled -}} | ||
| {{- $serviceName := include "sawtooth.validator.fullname" . -}} | ||
| {{- $ingressName := printf "%s-rest" $serviceName -}} | ||
| {{- $servicePort := .Values.sawtooth.ports.rest -}} | ||
| {{ include "lib.ingress" (dict "ingressName" $ingressName "ingress" .Values.ingress "serviceName" $serviceName "servicePort" $servicePort "context" $) }} | ||
| {{- end -}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| suite: test the ingresses | ||
| templates: | ||
| - ingress.yaml | ||
| release: | ||
| name: test | ||
| namespace: testns | ||
| tests: | ||
| - it: ingress links to service properly | ||
| set: | ||
| ingress: | ||
| enabled: true | ||
| asserts: | ||
| - equal: | ||
| path: spec.rules[0].http.paths[0].backend.service.name | ||
| value: test-sawtooth | ||
| - equal: | ||
| path: spec.rules[0].http.paths[0].backend.service.port.number | ||
| value: 8008 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters