[platform] Automatically exclude dependencies on disabled optional components

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

packages/core/platform/bundles/paas-full.yaml

@@ -321,12 +321,7 @@ releases:
     name: kubeapps-auth-config
     valuesKey: values.yaml
   {{- end }}
-
-  {{- if eq $oidcEnabled "true" }}
   dependsOn: [keycloak-configure]
-  {{- else }}
-  dependsOn: []
-  {{- end }}
 
 - name: kamaji
   releaseName: kamaji

packages/core/platform/templates/helmreleases.yaml

@@ -7,6 +7,9 @@
 
 {{/* collect dependency namespaces from releases */}}
 {{- range $x := $bundle.releases }}
+{{-   if or (has $x.name $disabledComponents) (and ($x.optional) (not (has $x.name $enabledComponents))) }}
+{{-     continue }}
+{{-   end }}
 {{-   $_ := set $dependencyNamespaces $x.name $x.namespace }}
 {{- end }}
 
@@ -86,7 +89,7 @@ spec:
   {{- with $x.dependsOn }}
   dependsOn:
   {{-   range $dep := . }}
-  {{-     if not (has $dep $disabledComponents) }}
+  {{-     if hasKey $dependencyNamespaces $dep }}
   - name: {{ $dep }}
     namespace: {{ index $dependencyNamespaces $dep }}
   {{-     end }}

packages/extra/ingress/Chart.yaml

@@ -3,4 +3,4 @@ name: ingress
 description: NGINX Ingress Controller
 icon: /logos/ingress-nginx.svg
 type: application
-version: 1.6.0
+version: 1.5.1

packages/extra/ingress/README.md

@@ -13,5 +13,4 @@
 | `dashboard`       | Should ingress serve Cozystack service dashboard                  | `false` |
 | `cdiUploadProxy`  | Should ingress serve CDI upload proxy                             | `false` |
 | `virtExportProxy` | Should ingress serve KubeVirt export proxy                        | `false` |
-| `api`             | Should ingress serve Cozystack API                                | `true`  |
 

packages/extra/ingress/templates/api.yaml

@@ -1,29 +0,0 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
-{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
-
-{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
-{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
-
-{{- if .Values.api }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-  name: api-{{ .Release.Namespace }}
-  namespace: default
-spec:
-  ingressClassName: {{ .Release.Namespace }}
-  rules:
-  - host: api.{{ $host }}
-    http:
-      paths:
-      - backend:
-          service:
-            name: kubernetes
-            port:
-              number: 443
-        path: /
-        pathType: Prefix
-{{- end }}

packages/extra/ingress/templates/cdi-uploadproxy.yaml

@@ -10,7 +10,11 @@ kind: Ingress
 metadata:
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    {{- if eq $issuerType "cloudflare" }} 
+    {{- else }}
+    acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }}
+    {{- end }}
   name: cdi-uploadproxy-{{ .Release.Namespace }}
   namespace: cozy-kubevirt-cdi
 spec:
@@ -26,4 +30,8 @@ spec:
               number: 443
         path: /
         pathType: Prefix
+  tls:
+  - hosts:
+    - cdi-uploadproxy.{{ $host }}
+    secretName: cdi-uploadproxy-{{ .Release.Namespace }}-tls
 {{- end }}

packages/extra/ingress/values.schema.json

@@ -40,11 +40,6 @@
             "type": "boolean",
             "description": "Should ingress serve KubeVirt export proxy",
             "default": false
-        },
-        "api": {
-            "type": "boolean",
-            "description": "Should ingress serve Cozystack API",
-            "default": true
         }
     }
 }

packages/extra/ingress/values.yaml

@@ -33,6 +33,3 @@ cdiUploadProxy: false
 
 ## @param virtExportProxy Should ingress serve KubeVirt export proxy
 virtExportProxy: false
-
-## @param api Should ingress serve Cozystack API
-api: true

packages/extra/ingress/vm-exportproxy.yaml

@@ -10,7 +10,11 @@ kind: Ingress
 metadata:
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    {{- if eq $issuerType "cloudflare" }} 
+    {{- else }}
+    acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }}
+    {{- end }}
   name: virt-exportproxy-{{ .Release.Namespace }}
   namespace: cozy-kubevirt
 spec:
@@ -26,4 +30,8 @@ spec:
               number: 443
         path: /
         pathType: ImplementationSpecific
+  tls:
+  - hosts:
+    virt-exportproxy.{{ $host }}
+    secretName: virt-exportproxy-{{ .Release.Namespace }}-tls
 {{- end }}

packages/extra/versions_map

@@ -19,7 +19,7 @@ ingress 1.2.0 28fca4ef
 ingress 1.3.0 fde4bcfa
 ingress 1.4.0 fd240701
 ingress 1.5.0 93bdf411
-ingress 1.6.0 HEAD
+ingress 1.5.1 HEAD
 monitoring 1.0.0 d7cfa53c
 monitoring 1.1.0 25221fdc
 monitoring 1.2.0 f81be075