Commit 727a37b6 authored by Philippe Pepiot's avatar Philippe Pepiot
Browse files

Use r.intra.logilab.fr instead of deprecated hub.extranet.logilab.fr

parent 1dcab5b4263f
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 @@ dev: build
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
......
......@@ -42,8 +42,6 @@ spec:
labels:
app: fresh
spec:
imagePullSecrets:
- name: regcred
volumes:
- name: static
emptyDir: {}
......@@ -58,7 +56,7 @@ spec:
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 @@ spec:
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 @@ spec:
labels:
app: fresh-scheduler
spec:
imagePullSecrets:
- name: regcred
volumes:
- name: cwclientlibrc
secret:
......@@ -132,7 +128,7 @@ spec:
claimName: fresh
containers:
- name: fresh
image: hub.extranet.logilab.fr/logilab/fresh
image: r.intra.logilab.fr/intranet/fresh
imagePullPolicy: Always
envFrom:
- secretRef:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment