From 7096e0f3aa1983c8ea9df657a591a896dc4c4e13 Mon Sep 17 00:00:00 2001
From: Jonathan Schaeffer <jonathan.schaeffer@cnrs.fr>
Date: Thu, 28 Apr 2022 09:43:15 +0200
Subject: [PATCH] Merge branch 'master' of
 gricad-gitlab.univ-grenoble-alpes.fr:OSUG/RESIF/ws.resif.fr-k8s

---
 deploy/overlays/dev/kustomization.yaml        | 2 +-
 deploy/overlays/production/kustomization.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/overlays/dev/kustomization.yaml b/deploy/overlays/dev/kustomization.yaml
index 960ec5d..004c685 100644
--- a/deploy/overlays/dev/kustomization.yaml
+++ b/deploy/overlays/dev/kustomization.yaml
@@ -7,7 +7,7 @@ configMapGenerator:
   name: ws-resif-fr-configmap
 images:
 - name: gricad-registry.univ-grenoble-alpes.fr/osug/resif/ws.resif.fr/ws-resif-fr
-  newTag: dev
+  newTag: develop
 kind: Kustomization
 namePrefix: dev-
 patches:
diff --git a/deploy/overlays/production/kustomization.yaml b/deploy/overlays/production/kustomization.yaml
index b4f35f2..20c5c0e 100644
--- a/deploy/overlays/production/kustomization.yaml
+++ b/deploy/overlays/production/kustomization.yaml
@@ -7,7 +7,7 @@ configMapGenerator:
   name: ws-resif-fr-configmap
 images:
 - name: gricad-registry.univ-grenoble-alpes.fr/osug/resif/ws.resif.fr/ws-resif-fr
-  newTag: main
+  newTag: production
 kind: Kustomization
 namePrefix: production-
 patches:
-- 
GitLab