Commit d2ffd740 authored by Philippe Pepiot's avatar Philippe Pepiot
Browse files

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

Also this repository doesn't need pull credentials
parent 7ce1b00e2135
REGISTRY?=hub.extranet.logilab.fr/logilab/intranet
REGISTRY?=r.intra.logilab.fr/intranet/intranet
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/intranet@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f -
sed "s@r.intra.logilab.fr/intranet/intranet@$(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/intranet
kubectl -n $(NAMESPACE) rollout status --timeout=180s deployment/intranet-scheduler
......
......@@ -42,8 +42,6 @@ spec:
labels:
app: intranet
spec:
imagePullSecrets:
- name: regcred
volumes:
- name: static
emptyDir: {}
......@@ -52,7 +50,7 @@ spec:
name: intranet
containers:
- name: intranet
image: hub.extranet.logilab.fr/logilab/intranet
image: r.intra.logilab.fr/intranet/intranet
imagePullPolicy: Always
envFrom:
- secretRef:
......@@ -67,7 +65,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
......@@ -107,11 +105,9 @@ spec:
labels:
app: intranet-scheduler
spec:
imagePullSecrets:
- name: regcred
containers:
- name: intranet
image: hub.extranet.logilab.fr/logilab/intranet
image: r.intra.logilab.fr/intranet/intranet
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