From b24a8d57820933784be332a542cd6cdbcb051777 Mon Sep 17 00:00:00 2001 From: rawlingsj Date: Thu, 15 Dec 2016 14:45:39 +0000 Subject: [PATCH] set expose and configmap controller versions now we dont use fabric8-devops release version to tag the images --- configmapcontroller/src/main/fabric8/deployment.yml | 2 +- exposecontroller/src/main/fabric8/deployment.yml | 2 +- pom.xml | 3 +++ release.groovy | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configmapcontroller/src/main/fabric8/deployment.yml b/configmapcontroller/src/main/fabric8/deployment.yml index b74832cd..71fe21df 100644 --- a/configmapcontroller/src/main/fabric8/deployment.yml +++ b/configmapcontroller/src/main/fabric8/deployment.yml @@ -4,7 +4,7 @@ spec: spec: containers: - name: configmapcontroller - image: fabric8/configmapcontroller:${project.version} + image: fabric8/configmapcontroller:${configmapcontroller.version} env: - name: "KUBERNETES_NAMESPACE" valueFrom: diff --git a/exposecontroller/src/main/fabric8/deployment.yml b/exposecontroller/src/main/fabric8/deployment.yml index 0a0d7024..e369014f 100644 --- a/exposecontroller/src/main/fabric8/deployment.yml +++ b/exposecontroller/src/main/fabric8/deployment.yml @@ -7,7 +7,7 @@ spec: spec: containers: - name: exposecontroller - image: fabric8/exposecontroller:${project.version} + image: fabric8/exposecontroller:${exposecontroller.version} env: - name: "KUBERNETES_NAMESPACE" valueFrom: diff --git a/pom.xml b/pom.xml index 439e480f..4395606d 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,9 @@ UTF-8 2.3.7 2.3.1 + + 2.3.1 + 2.3.1 diff --git a/release.groovy b/release.groovy index 27f29ae4..af2c73f7 100644 --- a/release.groovy +++ b/release.groovy @@ -4,7 +4,7 @@ def imagesBuiltByPipeline() { } def externalImages(){ - return ['configmapcontroller','exposecontroller','nginx-controller','alpine-caddy','hubot-irc','eclipse-orion','nexus','gerrit','fabric8-kiwiirc','brackets','jenkins-jnlp-client','taiga-front','taiga-back','hubot-slack','lets-chat','jenkins-docker','maven-builder','gogs','grafana'] + return ['nginx-controller','alpine-caddy','hubot-irc','eclipse-orion','nexus','gerrit','fabric8-kiwiirc','brackets','jenkins-jnlp-client','taiga-front','taiga-back','hubot-slack','lets-chat','jenkins-docker','maven-builder','gogs','grafana'] } def repo(){