Merge "Ingress function within Treasuremap streamlined." into v2

manifests/function/ingress/helmrelease.yaml

@@ -14,7 +14,13 @@ spec:
   values:
     defaultBackend:
       enabled: true
+      image:
+        repository: k8s.gcr.io/defaultbackend-amd64
+        tag:
     controller:
+      image:
+        repository: k8s.gcr.io/ingress-nginx/controller
+        tag:
       service:
         type: NodePort
         nodePorts:

manifests/function/ingress/kustomization.yaml

@@ -1,5 +1,4 @@
 resources:
-  - namespace.yaml
-  - helmrepository.yaml
   - helmrelease.yaml
-namespace: ingress
+  - helmrepository.yaml
+  - namespace.yaml

manifests/function/ingress/replacements/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+  - versions.yaml

manifests/function/ingress/replacements/versions.yaml

@@ -0,0 +1,79 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: ingress-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:latest
+replacements:
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.helm_repositories.ingress-nginx.url}"
+  target:
+    objref:
+      kind: HelmRepository
+      name: ingress-nginx
+    fieldrefs: ["{.spec.url}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.ingress-nginx.chart}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.chart.spec.chart}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.ingress-nginx.version}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.chart.spec.version}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.ingress-nginx.controller.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.values.controller.image.repository}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.ingress-nginx.controller.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.values.controller.image.tag}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.ingress-nginx.defaultBackend.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.values.defaultBackend.image.repository}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.ingress-nginx.defaultBackend.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: ingress
+    fieldrefs: ["{.spec.values.defaultBackend.image.tag}"]

manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml

@@ -17,6 +17,8 @@ spec:
       url: https://helm.min.io
     thanos:
       url: https://kubernetes-charts.banzaicloud.com
+    ingress-nginx:
+      url: https://kubernetes.github.io/ingress-nginx
 
   charts:
     grafana:
@@ -37,6 +39,9 @@ spec:
     thanos:
       chart: thanos-operator
       version: 0.1.0
+    ingress-nginx:
+      chart: ingress-nginx
+      version: 3.5.1
 
   images:
     grafana:
@@ -97,3 +102,10 @@ spec:
     thanos:
       repository: banzaicloud/thanos-operator
       tag: latest
+    ingress-nginx:
+      controller:
+        repository: k8s.gcr.io/ingress-nginx/controller
+        tag: v0.44.0
+      defaultBackend:
+        repository: k8s.gcr.io/defaultbackend-amd64
+        tag: 1.5

manifests/site/test-site/target/workload/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
-  - ../../../../type/airship-core/target/workload
+  - ../../../../type/airship-core/target/workload/ingress
   - ../catalogues
 transformers:
-  - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
+  - ../../../../function/ingress/replacements

manifests/site/virtual-network-cloud/target/workload/kustomization.yaml

@@ -2,6 +2,6 @@ resources:
   - ../../../../type/multi-tenant/target/workload
   - ../catalogues
 transformers:
-  - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
+  - ../../../../function/ingress/replacements
   - ../../../../function/sip/replacements
 

manifests/type/airship-core/target/workload/kustomization.yaml

@@ -1,2 +1,2 @@
 resources:
-  - ../../../../../../airshipctl/manifests/type/gating/target/workload
+  - ingress