Merge pull request #64 from rgdoliveira/sync_main

Sync main branch with Apache main branch
kiegroup · Jul 17, 2024 · c0584f0 · c0584f0
2 parents 0fdd9d6 + 2e59c54
commit c0584f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/controllers/platform/services/services.go b/controllers/platform/services/services.go
@@ -111,7 +111,7 @@ func (d DataIndexHandler) GetServiceImageName(persistenceType constants.Persiste
 		return cfg.GetCfg().DataIndexEphemeralImageTag
 	}
 	// returns "docker.io/apache/incubator-kie-kogito-data-index-<persistence_layer>:<tag>"
-	return fmt.Sprintf("%s-%s-%s:%s", constants.ImageNamePrefix, constants.DataIndexName, persistenceType.String(), version.GetTagVersion())
+	return fmt.Sprintf("%s-%s-%s:%s", constants.ImageNamePrefix, constants.DataIndexName, persistenceType.String(), version.GetServiceTagVersion())
 }
 
 func (d DataIndexHandler) GetServiceName() string {
@@ -273,7 +273,7 @@ func (j JobServiceHandler) GetServiceImageName(persistenceType constants.Persist
 		return cfg.GetCfg().JobsServiceEphemeralImageTag
 	}
 	// returns "docker.io/apache/incubator-kie-kogito-jobs-service-<persistece_layer>:<tag>"
-	return fmt.Sprintf("%s-%s-%s:%s", constants.ImageNamePrefix, constants.JobServiceName, persistenceType.String(), version.GetTagVersion())
+	return fmt.Sprintf("%s-%s-%s:%s", constants.ImageNamePrefix, constants.JobServiceName, persistenceType.String(), version.GetServiceTagVersion())
 }
 
 func (j JobServiceHandler) GetServiceName() string {

diff --git a/test/testdata/sonataflow.org_v1alpha08_sonataflow-simpleops.yaml b/test/testdata/sonataflow.org_v1alpha08_sonataflow-simpleops.yaml
@@ -25,7 +25,9 @@ metadata:
 spec:
   podTemplate:
     container:
-      image: docker.io/apache/incubator-kie-sonataflow-minimal-example:latest
+      # TODO use docker.io/apache/incubator-kie-sonataflow-minimal-example:latest
+      # when we complete https://github.com/apache/incubator-kie-kogito-serverless-operator/issues/504
+      image: quay.io/kiegroup/sonataflow-minimal-example:latest
   flow:
     start: HelloWorld
     states:

diff --git a/version/version.go b/version/version.go
@@ -30,7 +30,8 @@ const (
 	// This tag must reflect an existing tag in the registry. In development, must follow the git branch naming.
 	// When released, this version should reflect the `major.minor` version in the registry.
 	// For example, docker.io/apache/incubator-kie-sonataflow-operator:10.0
-	tagVersion = "main"
+	tagVersion        = "main"
+	serviceTagVersion = "weekly-latest"
 )
 
 // GetOperatorVersion gets the current binary version of the operator. Do not use it to compose image tags!
@@ -42,3 +43,10 @@ func GetOperatorVersion() string {
 func GetTagVersion() string {
 	return tagVersion
 }
+
+// GetServiceTagVersion gets the current tag version for the service images.
+// TODO, unify all with tagVersion="main", when "main" tag is produced for DI and JS.
+// Right now, Apache community only produces "weekly-latest", and "timestamped tags" for these services.
+func GetServiceTagVersion() string {
+	return serviceTagVersion
+}