From cbf9ecb346994d5e17e91cbd2a7be0f399626fb6 Mon Sep 17 00:00:00 2001 From: "Manoj Alva(ma257n)" Date: Tue, 23 Mar 2021 12:12:16 +0000 Subject: [PATCH] Ingress function within Treasuremap streamlined. - ingress function updated with replacements - Cleanup of stray entrypoint. Issue #109 Change-Id: I62f0768c45055a00275ee1de18e51e05c5cf0a00 --- manifests/function/ingress/helmrelease.yaml | 6 ++ manifests/function/ingress/kustomization.yaml | 5 +- .../ingress/replacements/kustomization.yaml | 2 + .../ingress/replacements/versions.yaml | 79 +++++++++++++++++++ .../versions-treasuremap.yaml | 12 +++ .../target/workload/kustomization.yaml | 4 +- .../target/workload/kustomization.yaml | 2 +- .../target/workload/kustomization.yaml | 2 +- 8 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 manifests/function/ingress/replacements/kustomization.yaml create mode 100644 manifests/function/ingress/replacements/versions.yaml diff --git a/manifests/function/ingress/helmrelease.yaml b/manifests/function/ingress/helmrelease.yaml index 0905feff2..0e28f42a5 100644 --- a/manifests/function/ingress/helmrelease.yaml +++ b/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: diff --git a/manifests/function/ingress/kustomization.yaml b/manifests/function/ingress/kustomization.yaml index a7803c57e..cf1390a86 100644 --- a/manifests/function/ingress/kustomization.yaml +++ b/manifests/function/ingress/kustomization.yaml @@ -1,5 +1,4 @@ resources: - - namespace.yaml - - helmrepository.yaml - helmrelease.yaml -namespace: ingress + - helmrepository.yaml + - namespace.yaml diff --git a/manifests/function/ingress/replacements/kustomization.yaml b/manifests/function/ingress/replacements/kustomization.yaml new file mode 100644 index 000000000..476638a21 --- /dev/null +++ b/manifests/function/ingress/replacements/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - versions.yaml \ No newline at end of file diff --git a/manifests/function/ingress/replacements/versions.yaml b/manifests/function/ingress/replacements/versions.yaml new file mode 100644 index 000000000..cd9694a88 --- /dev/null +++ b/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}"] diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index 8c0e725f1..341c9f0af 100644 --- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml +++ b/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 diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml index 1f16e8c1c..ed323b07b 100644 --- a/manifests/site/test-site/target/workload/kustomization.yaml +++ b/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 diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml index 7390e5850..c45465241 100644 --- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml +++ b/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 diff --git a/manifests/type/airship-core/target/workload/kustomization.yaml b/manifests/type/airship-core/target/workload/kustomization.yaml index 6b52294c8..d360c0e38 100644 --- a/manifests/type/airship-core/target/workload/kustomization.yaml +++ b/manifests/type/airship-core/target/workload/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - ../../../../../../airshipctl/manifests/type/gating/target/workload + - ingress