diff --git a/var/helm/templates/deployment.yaml b/var/helm/templates/deployment.yaml index c8005a9..e293fd0 100644 --- a/var/helm/templates/deployment.yaml +++ b/var/helm/templates/deployment.yaml @@ -45,11 +45,11 @@ spec: - name: OTEL_LOGS_EXPORTER value: "none" - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: "jaeger-collector.stack.svc.cluster.local:4317" + value: "jaeger-collector.jaeger.svc.cluster.local:4317" - name: OTEL_EXPORTER_OTLP_INSECURE value: "true" - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: "jaeger-collector.stack.svc.cluster.local:4317" + value: "jaeger-collector.jaeger.svc.cluster.local:4317" - name: OTEL_EXPORTER_OTLP_TRACES_INSECURE value: "true" ports: diff --git a/var/helm/templates/ingress.yaml b/var/helm/templates/ingress.yaml new file mode 100644 index 0000000..42aaf69 --- /dev/null +++ b/var/helm/templates/ingress.yaml @@ -0,0 +1,27 @@ +{{- if .Values.ingress.enabled }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: mpafastapi + annotations: + cert-manager.io/cluster-issuer: ca-issuer + traefik.ingress.kubernetes.io/router.entrypoints: https + traefik.ingress.kubernetes.io/router.tls: "true" +spec: + tls: + - hosts: + - {{ .Values.ingress.hostname }} + secretName: mpafastapi-cert + rules: + - host: {{ .Values.ingress.hostname }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ .Values.svc.name }} + port: + number: 80 +{{- end }} \ No newline at end of file diff --git a/var/helm/values.yaml b/var/helm/values.yaml index 5cd0283..40dbaae 100644 --- a/var/helm/values.yaml +++ b/var/helm/values.yaml @@ -16,7 +16,7 @@ svc: port: 80 route: - enabled: true + enabled: false name: route-mpafastapi hostnames: - mpafastapi.covenant.local @@ -24,5 +24,9 @@ route: - name: edge-ingress namespace: edge +ingress: + enabled: true + hostname: mpafastapi.nostromo.k8s + config: - db_url: "sqlite:///" + db_url: "sqlite://data/db.sqlite3"