Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get consul-dataplane image from helm chart #2232

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Get consul-dataplane image from helm chart #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought, but you could have the script take the YAML path or global key and cut down on the number of files.


# ===========> Helm Targets

Expand Down Expand Up @@ -164,6 +165,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
Expand Down
7 changes: 7 additions & 0 deletions control-plane/build-support/scripts/consul-dataplane-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"