Skip to content

Commit 57cf6e7

Browse files
committed
Update makefile to handle digest in config.yaml during execution of make update command
1 parent e10c869 commit 57cf6e7

File tree

4 files changed

+47
-4
lines changed

4 files changed

+47
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/scylla-operator-tests
33
/gen-release-notes
44
/gen-api-reference
5+
/get-scylla-version
56

67
# Test binary, build with `go test -c`
78
*.test

Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ define version-ldflags
8686
endef
8787
GO_LD_FLAGS ?=-ldflags '$(strip $(call version-ldflags,$(GO_PACKAGE)/pkg/version) $(GO_LD_EXTRA_FLAGS))'
8888

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+
8994
# TODO: look into how to make these local to the targets
9095
export DOCKER_BUILDKIT :=1
9196
export GOVERSION :=$(shell go version)
@@ -463,7 +468,7 @@ endef
463468
# $1 - values.yaml
464469
define update-scylla-helm-versions
465470
$(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)" ) | \
467472
select(fi==0).agentImage.tag = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
468473
select(fi==0)' \
469474
'$(1)' './assets/config/config.yaml'
@@ -472,7 +477,7 @@ endef
472477
# $1 - values.yaml
473478
define update-scylla-manager-helm-versions
474479
$(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)" ) | \
476481
select(fi==0).scylla.agentImage.tag = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
477482
select(fi==0).image.tag = ( select(fi==1) | .operator.scyllaDBManagerVersion ) | \
478483
select(fi==0)' \
@@ -545,7 +550,7 @@ verify-deploy:
545550
# $2 - ScyllaCluster document index
546551
define replace-scyllacluster-versions
547552
$(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)" ) | \
549554
select(fi==0 and di==$(2)).spec.agentVersion = ( select(fi==1) | .operator.scyllaDBManagerAgentVersion ) | \
550555
select(fi==0)' \
551556
'$(1)' './assets/config/config.yaml'

assets/config/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
operator:
2-
scyllaDBVersion: "6.2.0"
2+
scyllaDBVersion: "sha256:5b53a7c60d9f9555bb87791ff29b2e633c6f472aec00de7afaf4db1addc6d594"
33
# scyllaDBEnterpriseVersionNeedingConsistentClusterManagementOverride sets enterprise version
44
# that requires consistent_cluster_management workaround for restore.
55
# In the future, enterprise versions should be run as a different config instance in its own run.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (C) 2025 ScyllaDB
2+
3+
package main
4+
5+
import (
6+
"flag"
7+
"fmt"
8+
"os"
9+
10+
scyllasemver "github.com/scylladb/scylla-operator/pkg/semver"
11+
"k8s.io/klog/v2"
12+
)
13+
14+
func main() {
15+
klog.InitFlags(flag.CommandLine)
16+
err := flag.Set("logtostderr", "true")
17+
if err != nil {
18+
panic(err)
19+
}
20+
defer klog.Flush()
21+
22+
imageName := flag.String("image", "", "Image name to check")
23+
version := flag.String("version", "", "Version to check")
24+
25+
flag.Parse()
26+
27+
if *imageName == "" || *version == "" {
28+
klog.Fatalf("Usage: %s --image <imageName> --version <version>", os.Args[0])
29+
}
30+
31+
semVersion, fullVersion, err := scyllasemver.GetImageVersionAndDigest(*imageName, *version)
32+
if err != nil {
33+
klog.Fatalf("Error getting image version: %v", err)
34+
}
35+
36+
fmt.Printf("%s %s\n", semVersion, fullVersion)
37+
}

0 commit comments

Comments
 (0)