Master branch uses a master tag image (#4887)
This commit is contained in:
parent
9c0061f482
commit
0a7913a45a
5 changed files with 5 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -16,7 +16,7 @@
|
||||||
all: all-container
|
all: all-container
|
||||||
|
|
||||||
# Use the 0.0 tag for testing, it shouldn't clobber any release builds
|
# Use the 0.0 tag for testing, it shouldn't clobber any release builds
|
||||||
TAG ?= 0.26.2
|
TAG ?= master
|
||||||
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
||||||
DOCKER ?= docker
|
DOCKER ?= docker
|
||||||
SED_I ?= sed -i
|
SED_I ?= sed -i
|
||||||
|
|
|
@ -15,7 +15,7 @@ spec:
|
||||||
serviceAccountName: nginx-ingress-serviceaccount
|
serviceAccountName: nginx-ingress-serviceaccount
|
||||||
containers:
|
containers:
|
||||||
- name: nginx-ingress-controller
|
- name: nginx-ingress-controller
|
||||||
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.2
|
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:master
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/$(NGINX_CONFIGMAP_NAME)
|
- --configmap=$(POD_NAMESPACE)/$(NGINX_CONFIGMAP_NAME)
|
||||||
|
|
|
@ -12,7 +12,7 @@ resources:
|
||||||
- service.yaml
|
- service.yaml
|
||||||
images:
|
images:
|
||||||
- name: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
|
- name: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
|
||||||
newTag: 0.26.2
|
newTag: master
|
||||||
vars:
|
vars:
|
||||||
- fieldref:
|
- fieldref:
|
||||||
fieldPath: metadata.name
|
fieldPath: metadata.name
|
||||||
|
|
|
@ -217,7 +217,7 @@ spec:
|
||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: nginx-ingress-controller
|
- name: nginx-ingress-controller
|
||||||
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.2
|
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:master
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
||||||
|
|
|
@ -28,7 +28,7 @@ spec:
|
||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: nginx-ingress-controller
|
- name: nginx-ingress-controller
|
||||||
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.2
|
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:master
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
||||||
|
|
Loading…
Reference in a new issue