@@ -86,6 +86,11 @@ define version-ldflags
86
86
endef
87
87
GO_LD_FLAGS ?=-ldflags '$(strip $(call version-ldflags,$(GO_PACKAGE ) /pkg/version) $(GO_LD_EXTRA_FLAGS ) ) '
88
88
89
+ GET_SCYLLADB_VERSION_SCRIPT ?= $(GO ) run ./cmd/get-scylla-version/get-scylla-version.go
90
+ SCYLLADB_VERSION_FROM_CONFIG := $(shell yq e '.operator.scyllaDBVersion' ./assets/config/config.yaml)
91
+ GET_SCYLLADB_VERSION_SCRIPT_RESULT := $(shell $(GET_SCYLLADB_VERSION_SCRIPT ) --image scylla --version $(SCYLLADB_VERSION_FROM_CONFIG ) )
92
+ SCYLLADB_SEM_VER := $(firstword $(GET_SCYLLADB_VERSION_SCRIPT_RESULT ) )
93
+
89
94
# TODO: look into how to make these local to the targets
90
95
export DOCKER_BUILDKIT :=1
91
96
export GOVERSION :=$(shell go version)
@@ -463,7 +468,7 @@ endef
463
468
# $1 - values.yaml
464
469
define update-scylla-helm-versions
465
470
$(YQ ) eval-all -i -P '\
466
- select(fi==0).scyllaImage.tag = ( select(fi==1) | .operator.scyllaDBVersion ) | \
471
+ select(fi==0).scyllaImage.tag = ( select(fi==1) | " $( SCYLLADB_SEM_VER ) " ) | \
467
472
select(fi==0).agentImage.tag = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
468
473
select(fi==0)' \
469
474
'$(1 ) ' './assets/config/config.yaml'
@@ -472,7 +477,7 @@ endef
472
477
# $1 - values.yaml
473
478
define update-scylla-manager-helm-versions
474
479
$(YQ ) eval-all -i -P '\
475
- select(fi==0).scylla.scyllaImage.tag = ( select(fi==1) | .operator.scyllaDBVersion ) | \
480
+ select(fi==0).scylla.scyllaImage.tag = ( select(fi==1) | " $( SCYLLADB_SEM_VER ) " ) | \
476
481
select(fi==0).scylla.agentImage.tag = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
477
482
select(fi==0).image.tag = ( select(fi==1) | .operator.scyllaDBManagerVersion ) | \
478
483
select(fi==0)' \
@@ -545,7 +550,7 @@ verify-deploy:
545
550
# $2 - ScyllaCluster document index
546
551
define replace-scyllacluster-versions
547
552
$(YQ ) eval-all -i -P '\
548
- select(fi==0 and di==$(2 ) ).spec.version = ( select(fi==1) | .operator.scyllaDBVersion ) | \
553
+ select(fi==0 and di==$(2 ) ).spec.version = ( select(fi==1) | " $( SCYLLADB_SEM_VER ) " ) | \
549
554
select(fi==0 and di==$(2 ) ).spec.agentVersion = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
550
555
select(fi==0)' \
551
556
'$(1 ) ' './assets/config/config.yaml'
0 commit comments