Scoped recommended labels to apply to Pod and Service, added unit-tes…

…ts and integration-tests for both Application and SKIPJob

api/v1alpha1/application_types.go

@@ -418,7 +418,6 @@ func (a *Application) SetStatus(status SkiperatorStatus) {
 func (a *Application) GetDefaultLabels() map[string]string {
 	return map[string]string{
 		"app.kubernetes.io/name":                  a.Name,
-		"app.kubernetes.io/version":               getVersionLabel(a.Spec.Image),
 		"app.kubernetes.io/managed-by":            "skiperator",
 		"skiperator.kartverket.no/controller":     "application",
 		"application.skiperator.no/app":           a.Name,

api/v1alpha1/skipjob_types.go

@@ -269,7 +269,6 @@ func (skipJob *SKIPJob) FillDefaultStatus() {
 func (skipJob *SKIPJob) GetDefaultLabels() map[string]string {
 	return map[string]string{
 		"app.kubernetes.io/name":              skipJob.Name,
-		"app.kubernetes.io/version":           getVersionLabel(skipJob.Spec.Container.Image),
 		"app.kubernetes.io/managed-by":        "skiperator",
 		"skiperator.kartverket.no/controller": "skipjob",
 		// Used by hahaha to know that the Pod should be watched for killing sidecars

api/v1alpha1/skipobj_interfaces.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/kartverket/skiperator/api/v1alpha1/podtypes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 type SKIPObject interface {
@@ -22,25 +21,3 @@ type CommonSpec struct {
 	AccessPolicy *podtypes.AccessPolicy
 	GCP          *podtypes.GCP
 }
-
-func getVersionLabel(imageVersionString string) string {
-	parts := strings.Split(imageVersionString, ":")
-
-	// Implicitly assume version "latest" if no version is specified
-	if len(parts) < 2 {
-		return "latest"
-	}
-
-	versionPart := parts[1]
-
-	// Remove "@sha256" from version text if version includes a hash
-	if strings.Contains(versionPart, "@") {
-		versionPart = strings.Split(versionPart, "@")[0]
-	}
-
-	// Add build number to version if it is specified
-	if len(parts) > 2 {
-		return versionPart + "+" + parts[2]
-	}
-	return versionPart
-}

pkg/resourcegenerator/deployment/deployment.go

@@ -108,6 +108,7 @@ func Generate(r reconciliation.Reconciliation) error {
 	} else {
 		podTemplateLabels = util.GetPodAppSelector(application.Name)
 	}
+	podTemplateLabels["app.kubernetes.io/version"] = resourceutils.GetImageVersion(application.Spec.Image)
 
 	// Add annotations to pod template, safe-to-evict added due to issues
 	// with cluster-autoscaler and unable to evict pods with local volumes

pkg/resourcegenerator/job/job.go

@@ -6,6 +6,7 @@ import (
 	"github.com/kartverket/skiperator/pkg/reconciliation"
 	"github.com/kartverket/skiperator/pkg/resourcegenerator/gcp"
 	"github.com/kartverket/skiperator/pkg/resourcegenerator/pod"
+	"github.com/kartverket/skiperator/pkg/resourcegenerator/resourceutils"
 	"github.com/kartverket/skiperator/pkg/resourcegenerator/volume"
 	"github.com/kartverket/skiperator/pkg/util"
 	batchv1 "k8s.io/api/batch/v1"
@@ -27,7 +28,10 @@ func Generate(r reconciliation.Reconciliation) error {
 	meta := metav1.ObjectMeta{
 		Namespace: skipJob.Namespace,
 		Name:      skipJob.Name,
-		Labels:    map[string]string{"app": skipJob.KindPostFixedName()},
+		Labels: map[string]string{
+			"app":                       skipJob.KindPostFixedName(),
+			"app.kubernetes.io/version": resourceutils.GetImageVersion(skipJob.Spec.Container.Image),
+		},
 	}
 	job := batchv1.Job{ObjectMeta: meta}
 	cronJob := batchv1.CronJob{ObjectMeta: meta}
@@ -72,6 +76,7 @@ func getCronJobSpec(skipJob *skiperatorv1alpha1.SKIPJob, selector *metav1.LabelS
 	// it's not a default label, maybe it could be?
 	// used for selecting workloads by netpols, grafana etc
 	spec.JobTemplate.Labels["app"] = skipJob.KindPostFixedName()
+	spec.JobTemplate.Labels["app.kubernetes.io/version"] = resourceutils.GetImageVersion(skipJob.Spec.Container.Image)
 
 	return spec
 }
@@ -127,6 +132,7 @@ func getJobSpec(skipJob *skiperatorv1alpha1.SKIPJob, selector *metav1.LabelSelec
 	// it's not a default label, maybe it could be?
 	// used for selecting workloads by netpols, grafana etc
 	jobSpec.Template.Labels["app"] = skipJob.KindPostFixedName()
+	jobSpec.Template.Labels["app.kubernetes.io/version"] = resourceutils.GetImageVersion(skipJob.Spec.Container.Image)
 
 	return jobSpec
 }

pkg/resourcegenerator/resourceutils/helpers.go

@@ -3,6 +3,7 @@ package resourceutils
 import (
 	skiperatorv1alpha1 "github.com/kartverket/skiperator/api/v1alpha1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"strings"
 )
 
 func ShouldScaleToZero(jsonReplicas *apiextensionsv1.JSON) bool {
@@ -16,3 +17,25 @@ func ShouldScaleToZero(jsonReplicas *apiextensionsv1.JSON) bool {
 	}
 	return false
 }
+
+func GetImageVersion(imageVersionString string) string {
+	parts := strings.Split(imageVersionString, ":")
+
+	// Implicitly assume version "latest" if no version is specified
+	if len(parts) < 2 {
+		return "latest"
+	}
+
+	versionPart := parts[1]
+
+	// Remove "@sha256" from version text if version includes a hash
+	if strings.Contains(versionPart, "@") {
+		versionPart = strings.Split(versionPart, "@")[0]
+	}
+
+	// Add build number to version if it is specified
+	if len(parts) > 2 {
+		return versionPart + "+" + parts[2]
+	}
+	return versionPart
+}

pkg/resourcegenerator/resourceutils/helpers_test.go

@@ -0,0 +1,47 @@
+package resourceutils
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestGetImageVersionNoTag(t *testing.T) {
+	imageString := "image"
+	expectedImageString := "latest"
+
+	actualImageString := GetImageVersion(imageString)
+
+	assert.Equal(t, expectedImageString, actualImageString)
+}
+
+func TestGetImageVersionLatestTag(t *testing.T) {
+	imageString := "image:latest"
+	expectedImageString := "latest"
+
+	actualImageString := GetImageVersion(imageString)
+
+	assert.Equal(t, expectedImageString, actualImageString)
+}
+
+func TestGetImageVersionVersionTag(t *testing.T) {
+	versionImageString := "image:1.2.3"
+	devImageString := "image:1.2.3-dev-123abc"
+	expectedVersionImageString := "1.2.3"
+	expectedDevImageString := "1.2.3-dev-123abc"
+
+	actualVersionImageString := GetImageVersion(versionImageString)
+	actualDevImageString := GetImageVersion(devImageString)
+
+	assert.Equal(t, expectedVersionImageString, actualVersionImageString)
+	assert.Equal(t, expectedDevImageString, actualDevImageString)
+
+}
+
+func TestGetImageVersionShaTag(t *testing.T) {
+	imageString := "ghcr.io/org/repo@sha256:54d7ea8b48d0e7569766e0e10b9e38da778a5f65d764168dd7db76a37d6b8"
+	expectedImageString := "54d7ea8b48d0e7569766e0e10b9e38da778a5f65d764168dd7db76a37d6b8"
+
+	actualImageString := GetImageVersion(imageString)
+
+	assert.Equal(t, expectedImageString, actualImageString)
+}

pkg/resourcegenerator/resourceutils/metadata_test.go

@@ -32,7 +32,6 @@ func TestSetResourceLabels(t *testing.T) {
 
 	expectedLabels := map[string]string{
 		"app.kubernetes.io/name":                  "testapp",
-		"app.kubernetes.io/version":               "latest",
 		"app.kubernetes.io/managed-by":            "skiperator",
 		"skiperator.kartverket.no/controller":     "application",
 		"application.skiperator.no/app":           "testapp",

pkg/resourcegenerator/service/service.go

@@ -5,6 +5,7 @@ import (
 	skiperatorv1alpha1 "github.com/kartverket/skiperator/api/v1alpha1"
 	"github.com/kartverket/skiperator/api/v1alpha1/podtypes"
 	"github.com/kartverket/skiperator/pkg/reconciliation"
+	"github.com/kartverket/skiperator/pkg/resourcegenerator/resourceutils"
 	"github.com/kartverket/skiperator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,6 +37,7 @@ func Generate(r reconciliation.Reconciliation) error {
 
 	service := corev1.Service{ObjectMeta: metav1.ObjectMeta{Namespace: application.Namespace, Name: application.Name}}
 	service.Labels = util.GetPodAppSelector(application.Name)
+	service.Labels["app.kubernetes.io/version"] = resourceutils.GetImageVersion(application.Spec.Image)
 
 	ports := append(getAdditionalPorts(application.Spec.AdditionalPorts), getServicePort(application.Spec.Port, application.Spec.AppProtocol))
 	if r.IsIstioEnabled() {

tests/application/labels-imageversion/application-assert.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/version: "1234567890123456"
+
+---
+
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    app.kubernetes.io/version: "1234567890123456"

tests/application/labels-imageversion/application-patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: skiperator.kartverket.no/v1alpha1
+kind: Application
+metadata:
+  name: imageversionshalabel
+spec:
+  image: image@sha256:1234567890123456
+  port: 8080

tests/application/labels-imageversion/application.yaml

@@ -0,0 +1,7 @@
+apiVersion: skiperator.kartverket.no/v1alpha1
+kind: Application
+metadata:
+  name: imageversionlabellatest
+spec:
+  image: image
+  port: 8080

tests/application/labels-imageversion/chainsaw-test.yaml

@@ -0,0 +1,16 @@
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: resource-label
+spec:
+  skip: false
+  concurrent: true
+  skipDelete: false
+  steps:
+    - try:
+        - create:
+            file: application.yaml
+        - apply:
+            file: application-patch.yaml
+        - assert:
+            file: application-assert.yaml

tests/application/minimal/application-assert.yaml

@@ -5,6 +5,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: "Prune=false"
   labels:
+    app.kubernetes.io/name: minimal
     app.kubernetes.io/managed-by: "skiperator"
     skiperator.kartverket.no/controller: "application"
     application.skiperator.no/app: minimal
@@ -23,6 +24,7 @@ kind: Deployment
 metadata:
   name: minimal
   labels:
+    app.kubernetes.io/name: minimal
     app.kubernetes.io/managed-by: "skiperator"
     skiperator.kartverket.no/controller: "application"
     application.skiperator.no/app: minimal
@@ -123,6 +125,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: "Prune=false"
   labels:
+    app.kubernetes.io/name: minimal
     app.kubernetes.io/managed-by: "skiperator"
     skiperator.kartverket.no/controller: "application"
     application.skiperator.no/app: minimal
@@ -156,6 +159,8 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: "Prune=false"
   labels:
+    app.kubernetes.io/name: minimal
+    app.kubernetes.io/version: latest
     app.kubernetes.io/managed-by: "skiperator"
     skiperator.kartverket.no/controller: "application"
     application.skiperator.no/app: minimal
@@ -185,6 +190,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: "Prune=false"
   labels:
+    app.kubernetes.io/name: minimal
     app.kubernetes.io/managed-by: "skiperator"
     skiperator.kartverket.no/controller: "application"
     application.skiperator.no/app: minimal

tests/skipjob/minimal-job/skipjob-assert.yaml

@@ -10,6 +10,7 @@ metadata:
   labels:
     skiperator.kartverket.no/skipjob: "true"
     skiperator.kartverket.no/skipjobName: minimal-job
+    app.kubernetes.io/version: "5.34.0"
     app.kubernetes.io/managed-by:        "skiperator"
     skiperator.kartverket.no/controller: "skipjob"
 spec: