Deployment was broken when using a pinned tag (#401)

instead of only a tag or only a digest. Fixes #389

Author: aboukhal

apis/mattermost/v1alpha1/clusterinstallation_test.go

@@ -163,6 +163,13 @@ func TestClusterInstallation(t *testing.T) {
 		assert.Contains(t, ci.GetImageName(), ci.Spec.Version)
 		assert.Equal(t, ci.GetImageName(), fmt.Sprintf("%s@%s", ci.Spec.Image, ci.Spec.Version))
 	})
+
+	t.Run("using tag and digest", func(t *testing.T) {
+		ci.Spec.Version = "10.6.1@sha256:dd15a51ac7dafd213744d1ef23394e7532f71a90f477c969b94600e46da5a0cf"
+		assert.Contains(t, ci.GetImageName(), ci.Spec.Image)
+		assert.Contains(t, ci.GetImageName(), ci.Spec.Version)
+		assert.Equal(t, ci.GetImageName(), fmt.Sprintf("%s:%s", ci.Spec.Image, ci.Spec.Version))
+	})
 }
 
 func TestGetDeploymentImageName(t *testing.T) {

apis/mattermost/v1alpha1/clusterinstallation_utils.go

@@ -189,10 +189,10 @@ func (mattermost *ClusterInstallation) GetMattermostAppContainer(containers []co
 // GetImageName returns the container image name that matches the spec of the
 // ClusterInstallation.
 func (mattermost *ClusterInstallation) GetImageName() string {
-	// if user set the version using the Digest instead of tag like
+	// if user set the version using only the Digest instead of tag or tag@digest like
 	// sha256:dd15a51ac7dafd213744d1ef23394e7532f71a90f477c969b94600e46da5a0cf
 	// we need to set the @ instead of : to split the image name and "tag"
-	if strings.Contains(mattermost.Spec.Version, "sha256:") {
+	if strings.HasPrefix(mattermost.Spec.Version, "sha256:") {
 		return fmt.Sprintf("%s@%s", mattermost.Spec.Image, mattermost.Spec.Version)
 	}
 	return fmt.Sprintf("%s:%s", mattermost.Spec.Image, mattermost.Spec.Version)

apis/mattermost/v1beta1/mattermost_test.go

@@ -157,6 +157,13 @@ func TestMattermost(t *testing.T) {
 		assert.Contains(t, mm.GetImageName(), mm.Spec.Version)
 		assert.Equal(t, mm.GetImageName(), fmt.Sprintf("%s@%s", mm.Spec.Image, mm.Spec.Version))
 	})
+
+	t.Run("using tag and digest", func(t *testing.T) {
+		mm.Spec.Version = "10.6.1@sha256:dd15a51ac7dafd213744d1ef23394e7532f71a90f477c969b94600e46da5a0cf"
+		assert.Contains(t, mm.GetImageName(), mm.Spec.Image)
+		assert.Contains(t, mm.GetImageName(), mm.Spec.Version)
+		assert.Equal(t, mm.GetImageName(), fmt.Sprintf("%s:%s", mm.Spec.Image, mm.Spec.Version))
+	})
 }
 
 func TestOtherUtils(t *testing.T) {

apis/mattermost/v1beta1/mattermost_utils.go

@@ -210,10 +210,10 @@ func getContainerByName(containers []corev1.Container, containerName string) *co
 // GetImageName returns the container image name that matches the spec of the
 // ClusterInstallation.
 func (mm *Mattermost) GetImageName() string {
-	// if user set the version using the Digest instead of tag like
+	// if user set the version using only the Digest instead of tag or tag@digest like
 	// sha256:dd15a51ac7dafd213744d1ef23394e7532f71a90f477c969b94600e46da5a0cf
 	// we need to set the @ instead of : to split the image name and "tag"
-	if strings.Contains(mm.Spec.Version, "sha256:") {
+	if strings.HasPrefix(mm.Spec.Version, "sha256:") {
 		return fmt.Sprintf("%s@%s", mm.Spec.Image, mm.Spec.Version)
 	}
 	return fmt.Sprintf("%s:%s", mm.Spec.Image, mm.Spec.Version)