Remove radix web console ingress

clusters/development/kustomization.yaml

@@ -8,7 +8,7 @@ resources:
 - ../../components/radix-platform/radix-oauth-guard # radix-oauth-guard repo
 - ../../components/radix-platform/radix-velero-plugin
 - ../../components/radix-platform/radix-vulnerability-scanner
-- ../../components/radix-platform/radix-app-ingresses
+- ../../components/radix-platform/radix-app-ingresses-2
 - ../../components/third-party/azure-service-operator
 - ../../components/third-party/azure-workload-identity
 - ../../components/third-party/blob-csi-driver

components/radix-platform/radix-app-ingresses-2/charts/ingress.api.yaml

@@ -0,0 +1,38 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+  labels:
+    radix-app: radix-api
+    radix-component: server
+  name: server.custom-domain
+  namespace: radix-api-${RADIX_APP_ENV:=tba}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: api.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: server
+                port:
+                  number: 3002
+    - host: api.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: server
+                port:
+                  number: 3002
+  tls:
+    - hosts:
+        - api.${AZ_RESOURCE_DNS:=tba}
+        - api.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      secretName: "radix-wildcard-tls-cert"

components/radix-platform/radix-app-ingresses-2/charts/ingress.canary.yaml

@@ -0,0 +1,38 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+  labels:
+    radix-app: radix-canary-golang
+    radix-component: www
+  name: www.custom-domain
+  namespace: radix-canary-golang-${RADIX_APP_ENV:=tba}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: canary.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: www
+                port:
+                  number: 5000
+    - host: canary.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: www
+                port:
+                  number: 5000
+  tls:
+    - hosts:
+        - canary.${AZ_RESOURCE_DNS:=tba}
+        - canary.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      secretName: "radix-wildcard-tls-cert"

components/radix-platform/radix-app-ingresses-2/charts/ingress.cost-api.yaml

@@ -0,0 +1,38 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+  labels:
+    radix-app: radix-cost-allocation-api
+    radix-component: server
+  name: server.custom-domain
+  namespace: radix-cost-allocation-api-${RADIX_APP_ENV:=tba}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: cost-api.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: server
+                port:
+                  number: 3003
+    - host: cost-api.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: server
+                port:
+                  number: 3003
+  tls:
+    - hosts:
+        - cost-api.${AZ_RESOURCE_DNS:=tba}
+        - cost-api.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      secretName: "radix-wildcard-tls-cert"

components/radix-platform/radix-app-ingresses-2/charts/ingress.public-site.yaml

@@ -0,0 +1,49 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+  labels:
+    radix-app: radix-public-site
+    radix-component: public-site
+  name: public-site-at.custom-domain
+  namespace: radix-public-site-${RADIX_APP_ENV:=tba}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: "${AZ_RESOURCE_DNS:=tba}"
+      http:
+        paths:
+          - backend:
+              service:
+                name: public-site
+                port:
+                  number: 8080
+            path: /
+            pathType: Prefix
+    - host: "www.${AZ_RESOURCE_DNS:=tba}"
+      http:
+        paths:
+          - backend:
+              service:
+                name: public-site
+                port:
+                  number: 8080
+            path: /
+            pathType: Prefix
+    - host: "www.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}"
+      http:
+        paths:
+          - backend:
+              service:
+                name: public-site
+                port:
+                  number: 8080
+            path: /
+            pathType: Prefix
+  tls:
+    - hosts:
+        - "${AZ_RESOURCE_DNS:=tba}"
+        - "www.${AZ_RESOURCE_DNS:=tba}"
+        - "www.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}"
+      secretName: radix-wildcard-tls-cert

components/radix-platform/radix-app-ingresses-2/charts/ingress.webhook.yaml

@@ -0,0 +1,38 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+  labels:
+    radix-app: radix-github-webhook
+    radix-component: webhook
+  name: webhook.custom-domain
+  namespace: radix-github-webhook-${RADIX_APP_ENV:=tba}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: webhook.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: webhook
+                port:
+                  number: 3001
+    - host: webhook.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: webhook
+                port:
+                  number: 3001
+  tls:
+    - hosts:
+        - webhook.${AZ_RESOURCE_DNS:=tba}
+        - webhook.${clusterName:=tba}.${AZ_RESOURCE_DNS:=tba}
+      secretName: "radix-wildcard-tls-cert"

components/radix-platform/radix-app-ingresses-2/charts/kustomization.yaml

@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.public-site.yaml
+  - ingress.public-site.yaml
+
+  - namespace.webhook.yaml
+  - ingress.webhook.yaml
+
+  - namespace.cost-api.yaml
+  - ingress.cost-api.yaml
+
+  - namespace.canary.yaml
+  - ingress.canary.yaml
+
+  - namespace.api.yaml
+  - ingress.api.yaml

components/radix-platform/radix-app-ingresses-2/charts/namespace.api.yaml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name:   radix-api-${RADIX_APP_ENV:=tba}

components/radix-platform/radix-app-ingresses-2/charts/namespace.canary.yaml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: radix-canary-golang-${RADIX_APP_ENV:=tba}

components/radix-platform/radix-app-ingresses-2/charts/namespace.cost-api.yaml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: radix-cost-allocation-api-${RADIX_APP_ENV:=tba}

components/radix-platform/radix-app-ingresses-2/charts/namespace.public-site.yaml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: radix-public-site-${RADIX_APP_ENV:=tba}

components/radix-platform/radix-app-ingresses-2/charts/namespace.webhook.yaml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name:  radix-github-webhook-${RADIX_APP_ENV:=tba}

components/radix-platform/radix-app-ingresses-2/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - radix-app-ingresses.yaml

components/radix-platform/radix-app-ingresses-2/radix-app-ingresses.yaml

@@ -0,0 +1,25 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: radix-app-ingresses-2
+  namespace: flux-system
+spec:
+  interval: 10m
+  retryInterval: 1m
+  # timeout: 2m
+  wait: true
+  prune: true
+  force: true # replace existing resources
+
+  path: "./components/radix-platform/radix-app-ingresses-2/charts"
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+
+  postBuild:
+    substitute:
+      RADIX_APP_ENV: ${RADIX_APP_ENV:=prod} # SET TO qa IN DEV
+      AZ_RESOURCE_DNS: ${AZ_RESOURCE_DNS:=tba} # set in postBuild
+    substituteFrom:
+      - kind: ConfigMap
+        name: radix-flux-config

components/radix-platform/radix-app-ingresses/charts/kustomization.yaml

@@ -6,7 +6,7 @@ resources:
 
   - namespace.webhook.yaml
   - ingress.webhook.yaml
- 
+
   - namespace.cost-api.yaml
   - ingress.cost-api.yaml
 

components/radix-platform/radix-app-ingresses/radix-app-ingresses.yaml

@@ -8,7 +8,7 @@ spec:
   retryInterval: 1m
   # timeout: 2m
   wait: true
-  prune: false
+  prune: true
   force: true # replace existing resources
 
   path: "./components/radix-platform/radix-app-ingresses/charts"