backport of commit 71293af (#2236)

Co-authored-by: Curt Bushko <cbushko@gmail.com>
hashicorp · Jun 1, 2023 · e96a86d · e96a86d
1 parent 189002a
commit e96a86d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 VERSION = $(shell ./control-plane/build-support/scripts/version.sh control-plane/version/version.go)
 CONSUL_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-version.sh charts/consul/values.yaml)
+CONSUL_DATAPLANE_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-dataplane-version.sh charts/consul/values.yaml)
 
 # ===========> Helm Targets
 
@@ -151,6 +152,10 @@ version:
 consul-version:
 	@echo $(CONSUL_IMAGE_VERSION)
 
+consul-dataplane-version:
+	@echo $(CONSUL_DATAPLANE_IMAGE_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-dataplane-version.sh b/control-plane/build-support/scripts/consul-dataplane-version.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+FILE=$1
+VERSION=$(yq .global.imageConsulDataplane $FILE)
+
+echo "${VERSION}"