diff --git a/template/stacks/core/argocd/values.kind.yaml b/template/stacks/core/argocd/values.kind.yaml index 8df9df4..8c3cc7f 100644 --- a/template/stacks/core/argocd/values.kind.yaml +++ b/template/stacks/core/argocd/values.kind.yaml @@ -25,20 +25,3 @@ notifications: dex: enabled: false - -server: - ingress: - enabled: true - ingressClassName: nginx - annotations: - nginx.ingress.kubernetes.io/backend-protocol: HTTP - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - path: /argocd(/|$)(.*) - pathType: ImplementationSpecific - extraTls: - - hosts: - - {{ .Values.edfbuilderTargetDomain }} - secretName: argocd-net-tls - diff --git a/template/stacks/core/argocd/values.osc.yaml b/template/stacks/core/argocd/values.osc.yaml index 122234c..9563036 100644 --- a/template/stacks/core/argocd/values.osc.yaml +++ b/template/stacks/core/argocd/values.osc.yaml @@ -31,23 +31,3 @@ notifications: dex: enabled: false - -server: - ingress: - enabled: true - ingressClassName: nginx - annotations: - dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: {{ .Values.edfbuilderTargetDomain }} - dns.gardener.cloud/ttl: "600" - nginx.ingress.kubernetes.io/backend-protocol: HTTP - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - path: /argocd(/|$)(.*) - pathType: ImplementationSpecific - extraTls: - - hosts: - - {{ .Values.edfbuilderTargetDomain }} - secretName: argocd-net-tls - diff --git a/template/stacks/core/forgejo/values.kind.yaml b/template/stacks/core/forgejo/values.kind.yaml index 210f6ca..243ca82 100644 --- a/template/stacks/core/forgejo/values.kind.yaml +++ b/template/stacks/core/forgejo/values.kind.yaml @@ -34,23 +34,6 @@ service: nodePort: 32222 externalTrafficPolicy: Local -ingress: - # NOTE: The ingress is generated in a later step for path based routing feature See: hack/argo-cd/generate-manifests.sh - enabled: true - className: nginx - annotations: - nginx.ingress.kubernetes.io/proxy-body-size: 512m - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - hosts: - - host: gitea.{{ .Values.edfbuilderTargetDomain }} - paths: - - path: / - pathType: Prefix - tls: - - hosts: - - gitea.{{ .Values.edfbuilderTargetDomain }} - secretName: forgejo-net-tls - image: pullPolicy: "IfNotPresent" # Overrides the image tag whose default is the chart appVersion. diff --git a/template/stacks/core/forgejo/values.osc.yaml b/template/stacks/core/forgejo/values.osc.yaml index 9ff2a9f..243ca82 100644 --- a/template/stacks/core/forgejo/values.osc.yaml +++ b/template/stacks/core/forgejo/values.osc.yaml @@ -34,26 +34,6 @@ service: nodePort: 32222 externalTrafficPolicy: Local -ingress: - # NOTE: The ingress is generated in a later step for path based routing feature See: hack/argo-cd/generate-manifests.sh - enabled: true - className: nginx - annotations: - dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: gitea.{{ .Values.edfbuilderTargetDomain }} - dns.gardener.cloud/ttl: "600" - nginx.ingress.kubernetes.io/proxy-body-size: 512m - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - hosts: - - host: gitea.{{ .Values.edfbuilderTargetDomain }} - paths: - - path: / - pathType: Prefix - tls: - - hosts: - - gitea.{{ .Values.edfbuilderTargetDomain }} - secretName: forgejo-net-tls - image: pullPolicy: "IfNotPresent" # Overrides the image tag whose default is the chart appVersion. diff --git a/template/stacks/core/ingress-apps.yaml b/template/stacks/core/ingress-apps.yaml new file mode 100644 index 0000000..7b6b125 --- /dev/null +++ b/template/stacks/core/ingress-apps.yaml @@ -0,0 +1,22 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: ingress-apps + namespace: argocd + labels: + example: ref-implementation + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + server: "https://kubernetes.default.svc" + source: + repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + targetRevision: HEAD + path: "stacks/core/ingress-apps" + project: default + syncPolicy: + automated: + selfHeal: true + syncOptions: + - CreateNamespace=true diff --git a/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml b/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml new file mode 100644 index 0000000..71cead0 --- /dev/null +++ b/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml @@ -0,0 +1,31 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + name: argo-workflows-ingress + namespace: argo +spec: + ingressClassName: nginx + rules: + - host: localhost + http: + paths: + - backend: + service: + name: argo-server + port: + name: web + path: /argo-workflows(/|$)(.*) + pathType: ImplementationSpecific + - host: cnoe.localtest.me + http: + paths: + - backend: + service: + name: argo-server + port: + name: web + path: /argo-workflows(/|$)(.*) + pathType: ImplementationSpecific diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/ingress-apps/argocd-server.yaml new file mode 100644 index 0000000..10b4a3a --- /dev/null +++ b/template/stacks/core/ingress-apps/argocd-server.yaml @@ -0,0 +1,27 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/backend-protocol: HTTP + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + name: argocd-server + namespace: argocd +spec: + ingressClassName: nginx + rules: + - host: cnoe.localtest.me + http: + paths: + - backend: + service: + name: argocd-server + port: + number: 80 + path: /argocd(/|$)(.*) + pathType: ImplementationSpecific + tls: + - hosts: + - cnoe.localtest.me + secretName: argocd-net-tls diff --git a/template/stacks/core/ingress-apps/backstage.yaml b/template/stacks/core/ingress-apps/backstage.yaml new file mode 100644 index 0000000..7f44187 --- /dev/null +++ b/template/stacks/core/ingress-apps/backstage.yaml @@ -0,0 +1,28 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: backstage + namespace: backstage +spec: + ingressClassName: nginx + rules: + - host: localhost + http: + paths: + - backend: + service: + name: backstage + port: + name: http + path: / + pathType: Prefix + - host: cnoe.localtest.me + http: + paths: + - backend: + service: + name: backstage + port: + name: http + path: / + pathType: Prefix diff --git a/template/stacks/ref-implementation/fibonacci-app/ingress.yaml b/template/stacks/core/ingress-apps/fibonacci-service.yaml similarity index 81% rename from template/stacks/ref-implementation/fibonacci-app/ingress.yaml rename to template/stacks/core/ingress-apps/fibonacci-service.yaml index c5d189b..c499226 100644 --- a/template/stacks/ref-implementation/fibonacci-app/ingress.yaml +++ b/template/stacks/core/ingress-apps/fibonacci-service.yaml @@ -6,7 +6,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: {{ .Values.edfbuilderTargetDomain }} + - host: cnoe.localtest.me http: paths: - backend: @@ -15,4 +15,4 @@ spec: port: number: 9090 path: /fibonacci - pathType: Prefix \ No newline at end of file + pathType: Prefix diff --git a/template/stacks/core/ingress-apps/forgejo.yaml b/template/stacks/core/ingress-apps/forgejo.yaml new file mode 100644 index 0000000..f53b3ec --- /dev/null +++ b/template/stacks/core/ingress-apps/forgejo.yaml @@ -0,0 +1,25 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/proxy-body-size: 512m + name: forgejo + namespace: gitea +spec: + ingressClassName: nginx + rules: + - host: gitea.cnoe.localtest.me + http: + paths: + - backend: + service: + name: forgejo-http + port: + number: 3000 + path: / + pathType: Prefix + tls: + - hosts: + - gitea.cnoe.localtest.me + secretName: forgejo-net-tls diff --git a/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml b/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml new file mode 100644 index 0000000..16b20c3 --- /dev/null +++ b/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml @@ -0,0 +1,28 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: keycloak-ingress-localhost + namespace: keycloak +spec: + ingressClassName: nginx + rules: + - host: localhost + http: + paths: + - backend: + service: + name: keycloak + port: + name: http + path: /keycloak + pathType: ImplementationSpecific + - host: cnoe.localtest.me + http: + paths: + - backend: + service: + name: keycloak + port: + name: http + path: /keycloak + pathType: ImplementationSpecific diff --git a/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml b/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml new file mode 100644 index 0000000..44c2b02 --- /dev/null +++ b/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: kube-prometheus-stack-grafana + namespace: monitoring +spec: + ingressClassName: nginx + rules: + - host: cnoe.localtest.me + http: + paths: + - backend: + service: + name: kube-prometheus-stack-grafana + port: + number: 80 + path: /grafana + pathType: Prefix diff --git a/template/stacks/core/ingress-apps/minio-console.yaml b/template/stacks/core/ingress-apps/minio-console.yaml new file mode 100644 index 0000000..ffa909d --- /dev/null +++ b/template/stacks/core/ingress-apps/minio-console.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: minio-console + namespace: minio-backup +spec: + ingressClassName: nginx + rules: + - host: minio-backup.cnoe.localtest.me + http: + paths: + - backend: + service: + name: minio-console + port: + number: 9001 + path: / + pathType: Prefix diff --git a/template/stacks/core/ingress-apps/openbao.yaml b/template/stacks/core/ingress-apps/openbao.yaml new file mode 100644 index 0000000..bb00b92 --- /dev/null +++ b/template/stacks/core/ingress-apps/openbao.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: openbao + namespace: openbao +spec: + ingressClassName: nginx + rules: + - host: openbao.cnoe.localtest.me + http: + paths: + - backend: + service: + name: openbao + port: + number: 8200 + path: / + pathType: Prefix diff --git a/template/stacks/local-backup/minio/helm/values.yaml b/template/stacks/local-backup/minio/helm/values.yaml index 8a58d96..eff14f0 100644 --- a/template/stacks/local-backup/minio/helm/values.yaml +++ b/template/stacks/local-backup/minio/helm/values.yaml @@ -14,10 +14,4 @@ persistence: buckets: - name: edfbuilder-backups -consoleIngress: - enabled: true - ingressClassName: nginx - hosts: - - minio-backup.{{ .Values.edfbuilderTargetDomain }} - existingSecret: root-creds diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 7b80872..bd4be29 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -17,13 +17,6 @@ grafana: syncOptions: - ServerSideApply=true - ingress: - enabled: true - ingressClassName: nginx - hosts: - - {{ .Values.edfbuilderTargetDomain }} - path: /grafana - sidecar: dashboards: enabled: true diff --git a/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml b/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml deleted file mode 100644 index ea8c75f..0000000 --- a/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: argo-workflows-ingress - namespace: argo - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: /$2 -spec: - ingressClassName: "nginx" - rules: - - host: localhost - http: - paths: - - path: /argo-workflows(/|$)(.*) - pathType: ImplementationSpecific - backend: - service: - name: argo-server - port: - name: web - - host: {{ .Values.edfbuilderTargetDomain }} - http: - paths: - - path: /argo-workflows(/|$)(.*) - pathType: ImplementationSpecific - backend: - service: - name: argo-server - port: - name: web diff --git a/template/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml b/template/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml index 042c3f6..2c56a2b 100644 --- a/template/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml +++ b/template/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml @@ -1,7 +1,6 @@ resources: - ../base - external-secret.yaml - - ingress.yaml - sa-admin.yaml patches: - path: patches/cm-argo-workflows.yaml diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index 6a77cfb..57124f2 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -425,32 +425,3 @@ spec: remoteRef: key: gitea-credential property: password ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: backstage - namespace: backstage -spec: - ingressClassName: "nginx" - rules: - - host: localhost - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: backstage - port: - name: http - - host: {{ .Values.edfbuilderTargetDomain }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: backstage - port: - name: http diff --git a/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml b/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml deleted file mode 100644 index 6fea2c7..0000000 --- a/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: keycloak-ingress-localhost - namespace: keycloak - annotations: - argocd.argoproj.io/sync-wave: "100" -spec: - ingressClassName: "nginx" - rules: - - host: localhost - http: - paths: - - path: /keycloak - pathType: ImplementationSpecific - backend: - service: - name: keycloak - port: - name: http - - host: {{ .Values.edfbuilderTargetDomain }} - http: - paths: - - path: /keycloak - pathType: ImplementationSpecific - backend: - service: - name: keycloak - port: - name: http diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index d929572..7fecb1d 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,10 +1,4 @@ server: - ingress: - enabled: true - ingressClassName: nginx - hosts: - - host: openbao.{{ .Values.edfbuilderTargetDomain }} - paths: [] dev: enabled: true