diff --git a/charts/durpapi/templates/ingress.yaml b/charts/durpapi/templates/ingress.yaml index 353f547..179dc5a 100644 --- a/charts/durpapi/templates/ingress.yaml +++ b/charts/durpapi/templates/ingress.yaml @@ -1,23 +1,54 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress +#apiVersion: networking.k8s.io/v1 +#kind: Ingress +#metadata: +# name: durpapi-ingress +# annotations: +# kubernetes.io/ingress.class: nginx +# cert-manager.io/cluster-issuer: {{ .Values.ingress.clusterissuer }} +#spec: +# rules: +# - host: {{ .Values.ingress.host }} +# http: +# paths: +# - path: / +# pathType: Prefix +# backend: +# service: +# name: durpapi +# port: +# number: 80 +# tls: +# - hosts: +# - {{ .Values.ingress.host }} +# secretName: {{ .Values.ingress.tls }} + +apiVersion: traefik.containo.us/v1alpha1 +kind: IngressRoute metadata: name: durpapi-ingress - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: {{ .Values.ingress.clusterissuer }} spec: - rules: - - host: {{ .Values.ingress.host }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: durpapi - port: - number: 80 + entryPoints: + - websecure + routes: + - match: Host("{{ .Values.ingress.host }}") && PathPrefix(`/`) + kind: Rule + services: + - name: {{ .Values.service.name }} + port: {{ .Values.service.targetport }} tls: - - hosts: - - {{ .Values.ingress.host }} - secretName: {{ .Values.ingress.tls }} + secretName: {{ .Values.ingress.tls }} + +--- + +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: {{ .Values.ingress.tls }} +spec: + secretName: {{ .Values.ingress.tls }} + issuerRef: + name: {{ .Values.ingress.clusterissuer }} + kind: ClusterIssuer + commonName: {{ .Values.ingress.host }} + dnsNames: + - {{ .Values.ingress.host }} diff --git a/charts/durpapi/templates/service.yaml b/charts/durpapi/templates/service.yaml index 69d4780..d7d05a2 100644 --- a/charts/durpapi/templates/service.yaml +++ b/charts/durpapi/templates/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: durpapi + name: {{ .Values.service.name }} spec: ports: - name: http port: {{ .Values.service.port }} - targetPort: 80 + targetPort: {{ .Values.service.targetport }} protocol: TCP selector: - app: durpapi \ No newline at end of file + app: {{ .Values.service.name }} \ No newline at end of file diff --git a/charts/durpapi/values.yaml b/charts/durpapi/values.yaml index 0fbe3cb..861eb25 100644 --- a/charts/durpapi/values.yaml +++ b/charts/durpapi/values.yaml @@ -11,5 +11,7 @@ ingress: tls: durpapi-tls service: + name: durpapi type: ClusterIP - port: 8080 \ No newline at end of file + port: 8080 + targetport: 80 \ No newline at end of file