Use r.intra.logilab.fr instead of deprecated hub.extranet.logilab.fr
authorPhilippe Pepiot <philippe.pepiot@logilab.fr>
Wed, 18 Sep 2019 09:28:25 +0200
changeset 118 0f1f2309c3d3
parent 117 1dcab5b4263f
child 119 32c11ddd4e75
Use r.intra.logilab.fr instead of deprecated hub.extranet.logilab.fr
Makefile
deploy/deployment.yaml
--- a/Makefile	Wed Sep 18 09:27:09 2019 +0200
+++ b/Makefile	Wed Sep 18 09:28:25 2019 +0200
@@ -1,4 +1,4 @@
-REGISTRY?=hub.extranet.logilab.fr/logilab/fresh
+REGISTRY?=r.intra.logilab.fr/intranet/fresh
 VERSION?=$(shell hg log -r . -T "{sub(':.*', '', '{latesttag}')}{sub('^-0-.*', '', '-{latesttagdistance}-hg{shortest(node, 7)}')}\n")
 IMAGE?=$(REGISTRY):$(VERSION)
 PORT?=8080
@@ -22,7 +22,7 @@
 	docker run --rm -it $(DOCKER_ARGS) -v `pwd`:/src $(IMAGE) bash
 
 deploy: push
-	sed "s@hub.extranet.logilab.fr/logilab/fresh@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f -
+	sed "s@r.intra.logilab.fr/intranet/fresh@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f -
 	@echo "wait at max 3 minutes for deployment to be UP"
 	kubectl -n $(NAMESPACE) rollout status --timeout=180s deployment/fresh
 	kubectl -n $(NAMESPACE) rollout status --timeout=180s deployment/fresh-scheduler
--- a/deploy/deployment.yaml	Wed Sep 18 09:27:09 2019 +0200
+++ b/deploy/deployment.yaml	Wed Sep 18 09:28:25 2019 +0200
@@ -42,8 +42,6 @@
       labels:
         app: fresh
     spec:
-      imagePullSecrets:
-        - name: regcred
       volumes:
         - name: static
           emptyDir: {}
@@ -58,7 +56,7 @@
             claimName: fresh
       containers:
         - name: fresh
-          image: hub.extranet.logilab.fr/logilab/fresh
+          image: r.intra.logilab.fr/intranet/fresh
           imagePullPolicy: Always
           envFrom:
             - secretRef:
@@ -81,7 +79,7 @@
             limits:
               memory: 500Mi
         - name: nginx
-          image: hub.extranet.logilab.fr/library/nginx
+          image: r.intra.logilab.fr/library/nginx
           imagePullPolicy: Always
           volumeMounts:
             - name: config
@@ -121,8 +119,6 @@
       labels:
         app: fresh-scheduler
     spec:
-      imagePullSecrets:
-        - name: regcred
       volumes:
         - name: cwclientlibrc
           secret:
@@ -132,7 +128,7 @@
             claimName: fresh
       containers:
         - name: fresh
-          image: hub.extranet.logilab.fr/logilab/fresh
+          image: r.intra.logilab.fr/intranet/fresh
           imagePullPolicy: Always
           envFrom:
             - secretRef: