Ingress function within Treasuremap streamlined.
- ingress function updated with replacements - Cleanup of stray entrypoint. Issue #109 Change-Id: I62f0768c45055a00275ee1de18e51e05c5cf0a00
This commit is contained in:
parent
138f3c0dc0
commit
cbf9ecb346
|
@ -14,7 +14,13 @@ spec:
|
||||||
values:
|
values:
|
||||||
defaultBackend:
|
defaultBackend:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
image:
|
||||||
|
repository: k8s.gcr.io/defaultbackend-amd64
|
||||||
|
tag:
|
||||||
controller:
|
controller:
|
||||||
|
image:
|
||||||
|
repository: k8s.gcr.io/ingress-nginx/controller
|
||||||
|
tag:
|
||||||
service:
|
service:
|
||||||
type: NodePort
|
type: NodePort
|
||||||
nodePorts:
|
nodePorts:
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
resources:
|
resources:
|
||||||
- namespace.yaml
|
|
||||||
- helmrepository.yaml
|
|
||||||
- helmrelease.yaml
|
- helmrelease.yaml
|
||||||
namespace: ingress
|
- helmrepository.yaml
|
||||||
|
- namespace.yaml
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
resources:
|
||||||
|
- 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}"]
|
|
@ -17,6 +17,8 @@ spec:
|
||||||
url: https://helm.min.io
|
url: https://helm.min.io
|
||||||
thanos:
|
thanos:
|
||||||
url: https://kubernetes-charts.banzaicloud.com
|
url: https://kubernetes-charts.banzaicloud.com
|
||||||
|
ingress-nginx:
|
||||||
|
url: https://kubernetes.github.io/ingress-nginx
|
||||||
|
|
||||||
charts:
|
charts:
|
||||||
grafana:
|
grafana:
|
||||||
|
@ -37,6 +39,9 @@ spec:
|
||||||
thanos:
|
thanos:
|
||||||
chart: thanos-operator
|
chart: thanos-operator
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
|
ingress-nginx:
|
||||||
|
chart: ingress-nginx
|
||||||
|
version: 3.5.1
|
||||||
|
|
||||||
images:
|
images:
|
||||||
grafana:
|
grafana:
|
||||||
|
@ -97,3 +102,10 @@ spec:
|
||||||
thanos:
|
thanos:
|
||||||
repository: banzaicloud/thanos-operator
|
repository: banzaicloud/thanos-operator
|
||||||
tag: latest
|
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
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
resources:
|
resources:
|
||||||
- ../../../../type/airship-core/target/workload
|
- ../../../../type/airship-core/target/workload/ingress
|
||||||
- ../catalogues
|
- ../catalogues
|
||||||
transformers:
|
transformers:
|
||||||
- ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
|
- ../../../../function/ingress/replacements
|
||||||
|
|
|
@ -2,6 +2,6 @@ resources:
|
||||||
- ../../../../type/multi-tenant/target/workload
|
- ../../../../type/multi-tenant/target/workload
|
||||||
- ../catalogues
|
- ../catalogues
|
||||||
transformers:
|
transformers:
|
||||||
- ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements
|
- ../../../../function/ingress/replacements
|
||||||
- ../../../../function/sip/replacements
|
- ../../../../function/sip/replacements
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
resources:
|
resources:
|
||||||
- ../../../../../../airshipctl/manifests/type/gating/target/workload
|
- ingress
|
||||||
|
|
Loading…
Reference in New Issue