Merge pull request #247 from MStokluska/THREESCALE-11013

THREESCALE-11013 include full 3scale version in apicast cr

Author: MStokluska

Diff for: apis/apps/v1alpha1/apicast_types.go

@@ -32,9 +32,10 @@ import (
 )
 
 const (
-	APIcastOperatorVersionAnnotation        = "apicast.apps.3scale.net/operator-version"
-	ReadyConditionType               string = "Ready"
-	WarningConditionType             string = "Warning"
+	APIcastOperatorVersionAnnotation          = "apicast.apps.3scale.net/operator-version"
+	APIcastThreescaleVersionAnnotation        = "apicast.apps.3scale.net/apicast-threescale-version"
+	ReadyConditionType                 string = "Ready"
+	WarningConditionType               string = "Warning"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -386,6 +387,11 @@ func (a *APIcast) UpdateOperatorVersion() bool {
 		changed = true
 	}
 
+	if v, ok := a.Annotations[APIcastThreescaleVersionAnnotation]; !ok || v != version.ThreescaleVersionMajorMinorPatch() {
+		a.Annotations[APIcastThreescaleVersionAnnotation] = version.ThreescaleVersionMajorMinorPatch()
+		changed = true
+	}
+
 	return changed
 }
 

Diff for: pkg/helper/labels.go

@@ -18,7 +18,7 @@ func MeteringLabels(componentType ComponentType) map[string]string {
 		// It should be updated on release branch
 		"rht.prod_ver":  "master",
 		"rht.comp":      "3scale_apicast",
-		"rht.comp_ver":  version.ThreescaleRelease,
+		"rht.comp_ver":  version.ThreescaleVersionMajorMinor(),
 		"rht.subcomp":   "apicast",
 		"rht.subcomp_t": string(componentType),
 	}

Diff for: test/manifests-version/deployment_version_test.go

@@ -55,7 +55,7 @@ func TestDeploymentVersions(t *testing.T) {
 		t.Errorf("Parsed object is not a Deployment object")
 	}
 
-	if deployment.Spec.Template.Labels["rht.comp_ver"] != version.ThreescaleRelease {
-		t.Errorf("rht.comp_ver differ: expected: %s; found: %s", version.ThreescaleRelease, deployment.Spec.Template.Labels["rht.comp_ver"])
+	if deployment.Spec.Template.Labels["rht.comp_ver"] != version.ThreescaleVersionMajorMinor() {
+		t.Errorf("rht.comp_ver differ: expected: %s; found: %s", version.ThreescaleVersionMajorMinor(), deployment.Spec.Template.Labels["rht.comp_ver"])
 	}
 }

Diff for: version/version.go

@@ -1,6 +1,22 @@
 package version
 
+import (
+	"strings"
+)
+
 var (
 	Version           = "0.13.0"
-	ThreescaleRelease = "2.16"
+	threescaleRelease = "2.16.0"
 )
+
+func ThreescaleVersionMajorMinor() string {
+	parts := strings.Split(threescaleRelease, ".")
+	if len(parts) >= 2 {
+		return parts[0] + "." + parts[1]
+	}
+	return ""
+}
+
+func ThreescaleVersionMajorMinorPatch() string {
+	return threescaleRelease
+}