backport of commit 3fdcf96

hashicorp · May 17, 2023 · bbbd9f9 · bbbd9f9
1 parent 27635b5
commit bbbd9f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 VERSION = $(shell ./control-plane/build-support/scripts/version.sh control-plane/version/version.go)
+CONSUL_VERSION = $(shell ./control-plane/build-support/scripts/consul-version.sh charts/consul/values.yaml)
 
 # ===========> Helm Targets
 
@@ -147,6 +148,10 @@ ci.aws-acceptance-test-cleanup: ## Deletes AWS resources left behind after faile
 version:
 	@echo $(VERSION)
 
+consul-version:
+	@echo $(CONSUL_VERSION)
+
+
 # ===========> Release Targets
 
 prepare-release: ## Sets the versions, updates changelog to prepare this repository to release

diff --git a/control-plane/build-support/scripts/consul-version.sh b/control-plane/build-support/scripts/consul-version.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+FILE=$1
+VERSION=$(yq .global.image $FILE)
+
+# echo full string "hashicorp/consul:1.15.1" | remove first and last characters | cut everything before ':'
+echo "${VERSION}" | sed 's/^.//;s/.$//' | cut -d ':' -f2-