Skip to content

support http and https ports for service closes #147 #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
travisghansen wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −10
Open

support http and https ports for service closes #147 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions step-certificates/templates/ca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,24 @@ spec:
{{- end }}
ports:
- name: https
containerPort: {{ .Values.service.targetPort }}
containerPort: {{ .Values.service.ports.https.targetPort }}
protocol: TCP
{{ if .Values.service.ports.http.enabled }}
- name: http
containerPort: {{ .Values.service.ports.http.targetPort }}
protocol: TCP
{{- end }}
livenessProbe:
initialDelaySeconds: 5
httpGet:
path: /health
port: {{ .Values.service.targetPort }}
port: {{ .Values.service.ports.https.targetPort }}
scheme: HTTPS
readinessProbe:
initialDelaySeconds: 5
httpGet:
path: /health
port: {{ .Values.service.targetPort }}
port: {{ .Values.service.ports.https.targetPort }}
scheme: HTTPS
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
18 changes: 15 additions & 3 deletions step-certificates/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,30 @@ metadata:
{{- end }}
spec:
type: {{ .Values.service.type }}
{{ if .Values.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{- end }}
{{- with .Values.service.externalIPs }}
externalIPs:
{{- toYaml . | nindent 4 }}
{{- end }}
ports:
- port: {{ .Values.service.port }}
targetPort: {{ .Values.service.targetPort }}
- port: {{ .Values.service.ports.https.port }}
targetPort: {{ .Values.service.ports.https.targetPort }}
protocol: TCP
name: https
{{- if eq .Values.service.type "NodePort" }}
nodePort: {{ .Values.service.nodePort }}
nodePort: {{ .Values.service.ports.https.nodePort }}
{{- end }}
{{ if .Values.service.ports.http.enabled }}
- port: {{ .Values.service.ports.http.port }}
targetPort: {{ .Values.service.ports.http.targetPort }}
protocol: TCP
name: http
{{- if eq .Values.service.type "NodePort" }}
nodePort: {{ .Values.service.ports.http.nodePort }}
{{- end }}
{{- end }}
selector:
app.kubernetes.io/name: {{ include "step-certificates.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
2 changes: 1 addition & 1 deletion step-certificates/templates/tests/test-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ spec:
args:
- '-s'
- '-k'
- 'https://{{ include "step-certificates.fullname" . }}:{{ .Values.service.port }}/health'
- 'https://{{ include "step-certificates.fullname" . }}:{{ .Values.service.ports.https.port }}/health'
restartPolicy: Never
14 changes: 11 additions & 3 deletions step-certificates/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,19 @@ inject:
# service contains configuration for the kubernes service.
service:
type: ClusterIP
port: 443
targetPort: 9000
nodePort: ""
loadBalancerIP: ""
annotations: {}
externalIPs: []
ports:
https:
port: 443
targetPort: 9000
nodePort: ""
http:
enabled: false
port: 80
targetPort: 8080
nodePort: ""

# linkedca contains the token to configure step-ca using the linkedca mode.
#
Expand Down
Loading