Skip to content

Commit

Permalink
Merge "Fix versions-treasuremap base catalogue"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and openstack-gerrit committed Apr 28, 2021
2 parents fddf272 + 2af3485 commit 8df65e5
Show file tree
Hide file tree
Showing 19 changed files with 394 additions and 115 deletions.
2 changes: 2 additions & 0 deletions manifests/function/dex-aio/replacements/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources:
- versions.yaml
168 changes: 168 additions & 0 deletions manifests/function/dex-aio/replacements/versions.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
apiVersion: airshipit.org/v1alpha1
kind: ReplacementTransformer
metadata:
name: dex-aio-versions-replacements
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
replacements:
# Helm repository
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.helm_repositories.dex-aio}"
target:
objref:
kind: HelmRepository
name: dex-helm-repo
fieldrefs: ["{.spec}"]

# chart
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.dex-aio.chart}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.chart.spec.chart}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.dex-aio.version}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.chart.version}"]

# images
# dex image components
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.dex.tag}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.dex.tag}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.dex.name}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.dex.name}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.dex.repository}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.dex.repo}"]
# nginx image components
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.nginx.tag}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.nginx.tag}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.nginx.name}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.nginx.name}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.nginx.repository}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.nginx.repo}"]
# authenticator
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.authenticator.tag}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.authenticator.tag}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.authenticator.name}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.authenticator.name}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.authenticator.repository}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.authenticator.repo}"]
# tls_init
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.tls_init.tag}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.tls_init.tag}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.tls_init.name}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.tls_init.name}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.image_components.dex-aio.tls_init.repository}"
target:
objref:
kind: HelmRelease
name: dex-aio
fieldrefs: ["{.spec.values.images.applications.tls_init.repo}"]
10 changes: 5 additions & 5 deletions manifests/function/grafana/replacements/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
replacements:
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.helm_repositories.grafana}"
target:
Expand All @@ -19,7 +19,7 @@ replacements:
fieldrefs: ["{.spec}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.grafana.chart}"
target:
Expand All @@ -29,7 +29,7 @@ replacements:
fieldrefs: ["{.spec.chart.spec.chart}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.grafana.version}"
target:
Expand All @@ -39,9 +39,9 @@ replacements:
fieldrefs: ["{.spec.chart.version}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.grafana}"
fieldref: "{.spec.image_components.grafana.grafana}"
target:
objref:
kind: HelmRelease
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ replacements:
# Container versions for the airship-host-config Deployment
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.airship-host-config.airship-host-config.image}"
fieldref: "{.spec.images.hostconfig-operator.airship-host-config.airship-host-config.image}"
target:
objref:
kind: Deployment
Expand Down
22 changes: 11 additions & 11 deletions manifests/function/ingress/replacements/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
replacements:
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.helm_repositories.ingress-nginx.url}"
target:
Expand All @@ -19,7 +19,7 @@ replacements:
fieldrefs: ["{.spec.url}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.ingress-nginx.chart}"
target:
Expand All @@ -29,7 +29,7 @@ replacements:
fieldrefs: ["{.spec.chart.spec.chart}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.ingress-nginx.version}"
target:
Expand All @@ -39,39 +39,39 @@ replacements:
fieldrefs: ["{.spec.chart.spec.version}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.ingress-nginx.controller.repository}"
fieldref: "{.spec.image_components.ingress-nginx.controller.repository}"
target:
objref:
kind: HelmRelease
name: ingress
fieldrefs: ["{.spec.values.controller.image.repository}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.ingress-nginx.controller.tag}"
fieldref: "{.spec.image_components.ingress-nginx.controller.tag}"
target:
objref:
kind: HelmRelease
name: ingress
fieldrefs: ["{.spec.values.controller.image.tag}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.ingress-nginx.defaultBackend.repository}"
fieldref: "{.spec.image_components.ingress-nginx.defaultBackend.repository}"
target:
objref:
kind: HelmRelease
name: ingress
fieldrefs: ["{.spec.values.defaultBackend.image.repository}"]
- source:
objref:
kind: VariableCatalogue
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.ingress-nginx.defaultBackend.tag}"
fieldref: "{.spec.image_components.ingress-nginx.defaultBackend.tag}"
target:
objref:
kind: HelmRelease
Expand Down

0 comments on commit 8df65e5

Please sign in to comment.