Merge "Change image tags"

This commit is contained in:
Zuul 2020-11-11 05:57:40 +00:00 committed by Gerrit Code Review
commit 9c9369088c
27 changed files with 27 additions and 27 deletions

View File

@ -22,7 +22,7 @@ DOCKER_REGISTRY ?= quay.io
DOCKER_FORCE_CLEAN ?= true DOCKER_FORCE_CLEAN ?= true
DOCKER_IMAGE_NAME ?= airshipctl DOCKER_IMAGE_NAME ?= airshipctl
DOCKER_IMAGE_PREFIX ?= airshipit DOCKER_IMAGE_PREFIX ?= airshipit
DOCKER_IMAGE_TAG ?= dev DOCKER_IMAGE_TAG ?= latest
DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
DOCKER_TARGET_STAGE ?= release DOCKER_TARGET_STAGE ?= release
PUBLISH ?= false PUBLISH ?= false

View File

@ -7,7 +7,7 @@ GOBIN := $(shell go env GOPATH)/bin
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
DOCKER_IMAGE_NAME ?= replacement-transformer DOCKER_IMAGE_NAME ?= replacement-transformer
DOCKER_IMAGE_PREFIX ?= airshipit DOCKER_IMAGE_PREFIX ?= airshipit
DOCKER_IMAGE_TAG ?= dev DOCKER_IMAGE_TAG ?= latest
DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
PUBLISH ?= false PUBLISH ?= false
DOCKER_FORCE_CLEAN ?= true DOCKER_FORCE_CLEAN ?= true

View File

@ -17,7 +17,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
name: k8scontrol-versions-replacements name: k8scontrol-versions-replacements
replacements: replacements:
# Replace the Kubernetes version in the KubeadmControlPlane # Replace the Kubernetes version in the KubeadmControlPlane

View File

@ -7,7 +7,7 @@ GOBIN := $(shell go env GOPATH)/bin
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
DOCKER_IMAGE_NAME ?= templater DOCKER_IMAGE_NAME ?= templater
DOCKER_IMAGE_PREFIX ?= airshipit DOCKER_IMAGE_PREFIX ?= airshipit
DOCKER_IMAGE_TAG ?= dev DOCKER_IMAGE_TAG ?= latest
DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
PUBLISH ?= false PUBLISH ?= false
DOCKER_FORCE_CLEAN ?= true DOCKER_FORCE_CLEAN ?= true

View File

@ -15,7 +15,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: | config.kubernetes.io/function: |
container: container:
image: quay.io/airshipit/templater:dev image: quay.io/airshipit/templater:latest
values: values:
hosts: hosts:
- macAddress: 00:aa:bb:cc:dd - macAddress: 00:aa:bb:cc:dd

View File

@ -7,7 +7,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/templater:dev image: quay.io/airshipit/templater:latest
template: | template: |
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the pod & service networks # Replace the pod & service networks
- source: - source:

View File

@ -7,7 +7,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Container versions for the ironic Deployment # Container versions for the ironic Deployment
- source: - source:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace capm3 versions # Replace capm3 versions
- source: - source:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Substring-replace the ephemeral control plane's info # Substring-replace the ephemeral control plane's info
- source: - source:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -8,7 +8,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/templater:dev image: quay.io/airshipit/templater:latest
values: values:
# hosts: # hosts:

View File

@ -7,7 +7,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -11,7 +11,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the pod & service networks # Replace the pod & service networks
- source: - source:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the Kubernetes version in the KubeadmControlPlane # Replace the Kubernetes version in the KubeadmControlPlane
- source: - source:

View File

@ -6,7 +6,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
# Replace the proxy vars # Replace the proxy vars
- source: - source:

View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
config.kubernetes.io/function: |- config.kubernetes.io/function: |-
container: container:
image: quay.io/airshipit/replacement-transformer:dev image: quay.io/airshipit/replacement-transformer:latest
replacements: replacements:
- source: - source:
objref: objref: