From 9ae9020b235c364dda417b45bac498f29beb015d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 29 Oct 2024 21:56:36 +0100
Subject: [PATCH] fix image tag generation

---
 helmfile/environments/default.yaml.gotmpl               | 5 ++---
 helmfile/scripts/{branded_image_tag.sh => image_tag.sh} | 0
 helmfile/scripts/ocelot_image_tag.sh                    | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename helmfile/scripts/{branded_image_tag.sh => image_tag.sh} (100%)
 delete mode 100755 helmfile/scripts/ocelot_image_tag.sh

diff --git a/helmfile/environments/default.yaml.gotmpl b/helmfile/environments/default.yaml.gotmpl
index b51a5f7..3a52ff8 100644
--- a/helmfile/environments/default.yaml.gotmpl
+++ b/helmfile/environments/default.yaml.gotmpl
@@ -1,7 +1,6 @@
-{{ $branded_image_tag:= env "BRANDED_IMAGE_TAG" | default (exec "../scripts/branded_image_tag.sh" (list) | trim) }}
-{{ $ocelot_image_tag := env "OCELOT_IMAGE_TAG" | default  (exec "../scripts/ocelot_image_tag.sh" (list) | trim) }}
+{{ $image_tag := env "IMAGE_TAG" | default  (exec "../scripts/image_tag.sh" (list) | trim) }}
 
 domain: staging.ocelot-social.roschaefer.de
 namespace: ocelot-staging
-image_tag: {{ env "IMAGE_TAG" | default (printf "ocelot-%s--branded-%s" $ocelot_image_tag $branded_image_tag) }}
+image_tag: {{ $image_tag }}
 github_repository: ocelot-social-community/stage.ocelot.social
diff --git a/helmfile/scripts/branded_image_tag.sh b/helmfile/scripts/image_tag.sh
similarity index 100%
rename from helmfile/scripts/branded_image_tag.sh
rename to helmfile/scripts/image_tag.sh
diff --git a/helmfile/scripts/ocelot_image_tag.sh b/helmfile/scripts/ocelot_image_tag.sh
deleted file mode 100755
index 6cc9baa..0000000
--- a/helmfile/scripts/ocelot_image_tag.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-SCRIPT_PATH=$(realpath $0)
-SCRIPT_DIR=$(dirname $SCRIPT_PATH)
-
-set -a; . ${SCRIPT_DIR}/../../.env; set +a;
-echo $OCELOT_VERSION