diff --git a/controllers/platform/services/services.go b/controllers/platform/services/services.go index 50baa8493..58e068daa 100644 --- 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-:" - 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-:" - 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 index 8c8de2a86..48711f5f2 100644 --- 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 index 7321fb27d..eb0eb353d 100644 --- 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 +}