Build images and dependencies upgrade (#1087)

<!-- Include the issue number below -->

## Proposed Changes
* Pin image version in create-release buildfile to ensure that docker is available
* Upgraded ASM and Tekton dependencies
* Changed pod selectors in ssh and logs commands so that they work with new Tekton versions

Author: balamut-google

cmd/generate-release/cloudbuild.yaml

@@ -30,9 +30,9 @@ substitutions:
   _EXTRA_TAG: ''      # Defaults to _VERSION
   _RELEASE_BUCKET: '' # Required
   _RELEASE_FOLDER: '' # Defaults to _VERSION
-  _CLOUDSDK_IMAGE: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
-  _GOLANG_IMAGE: 'golang:1.24'
-  _BUILDPACK_WRAPPER_GOLANG_IMAGE: 'golang:1.15'
+  _CLOUDSDK_IMAGE: 'gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine'
+  _GOLANG_IMAGE: 'golang:1.25'
+  _BUILDPACK_WRAPPER_GOLANG_IMAGE: 'golang:1.17'
   _KO_VERSION: 'github.com/google/ko@latest'
 
 timeout: '1800s'

pkg/apis/kf/v1alpha1/app_types.go

@@ -34,6 +34,10 @@ const (
 	NameLabel = "app.kubernetes.io/name"
 	// ManagedByLabel holds the standard label key for Kubernetes app managers.
 	ManagedByLabel = "app.kubernetes.io/managed-by"
+	// Value set on Pods by legacy Tekton versions
+	ManagedByKfValue = "kf"
+	// Value set on Pods by current GA Tekton versions
+	ManagedByTektonValue = "tekton-pipelines"
 	// ComponentLabel holds the standard label key for Kubernetes app component
 	// types.
 	ComponentLabel = "app.kubernetes.io/component"

pkg/kf/commands/apps/ssh.go

@@ -27,7 +27,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/remotecommand"
 )
 
@@ -85,8 +84,7 @@ func NewSSHCommand(p *config.KfParams) *cobra.Command {
 				podName := strings.TrimPrefix(appName, podPrefix)
 				podSelector.FieldSelector = fields.OneTermEqualSelector("metadata.name", podName).String()
 			} else {
-				appLabels := v1alpha1.AppComponentLabels(appName, "app-server")
-				podSelector.LabelSelector = labels.SelectorFromSet(appLabels).String()
+				podSelector.LabelSelector = metav1.FormatLabelSelector(labelSelectorForAppPods(appName, "app-server"))
 			}
 
 			execOpts := corev1.PodExecOptions{
@@ -153,3 +151,16 @@ func NewSSHCommand(p *config.KfParams) *cobra.Command {
 
 	return cmd
 }
+
+func labelSelectorForAppPods(appName, component string) *metav1.LabelSelector {
+	appLabels := v1alpha1.AppComponentLabels(appName, component)
+	delete(appLabels, v1alpha1.ManagedByLabel)
+	labelSelector := metav1.SetAsLabelSelector(appLabels)
+	// Due to https://github.com/tektoncd/pipeline/issues/8827 Kf pods wil have
+	// managed by label value hardcoded to "tekton-pipelines". Previous
+	// value "kf" left for backward compatibility
+	managedByRequirement := metav1.LabelSelectorRequirement{Key: v1alpha1.ManagedByLabel,
+		Operator: metav1.LabelSelectorOpIn, Values: []string{v1alpha1.ManagedByKfValue, v1alpha1.ManagedByTektonValue}}
+	labelSelector.MatchExpressions = []metav1.LabelSelectorRequirement{managedByRequirement}
+	return labelSelector
+}

pkg/kf/commands/apps/ssh_test.go

@@ -81,7 +81,7 @@ func TestNewSSHCommand(t *testing.T) {
 			wantExec:  true,
 			wantSpace: "my-space",
 			wantSelector: metav1.ListOptions{
-				LabelSelector: "app.kubernetes.io/component=app-server,app.kubernetes.io/managed-by=kf,app.kubernetes.io/name=my-app",
+				LabelSelector: "app.kubernetes.io/component=app-server,app.kubernetes.io/managed-by in (kf,tekton-pipelines),app.kubernetes.io/name=my-app",
 			},
 			wantExecOpts: corev1.PodExecOptions{
 				Command:   []string{"/bin/bash"},

pkg/kf/doctor/cluster.go

@@ -118,7 +118,7 @@ func diagnoseKfComponents(ctx context.Context, d *Diagnostic, vc discovery.Serve
 		},
 		"Tekton": {
 			groupVersion:      "tekton.dev/v1beta1",
-			expectedResources: []string{"taskruns", "tasks", "clustertasks"},
+			expectedResources: []string{"taskruns", "tasks"},
 		},
 	}
 

pkg/kf/logs/tailer.go

@@ -92,14 +92,25 @@ func (t *tailer) Tail(ctx context.Context, appName string, out io.Writer, opts .
 	return nil
 }
 
-func (t *tailer) watchForPods(ctx context.Context, namespace, appName string, writer *LineWriter, opts corev1.PodLogOptions, cfg tailConfig) error {
-
+func (t *tailer) labelSelectorForPodLogs(appName string, cfg tailConfig) *metav1.LabelSelector {
 	appLabels := v1alpha1.AppComponentLabels(appName, cfg.ComponentName)
 
 	selectors := v1alpha1.UnionMaps(appLabels, cfg.Labels)
+	delete(selectors, v1alpha1.ManagedByLabel)
+	labelSelectors := metav1.SetAsLabelSelector(selectors)
+	// Due to https://github.com/tektoncd/pipeline/issues/8827 Kf pods wil have
+	// managed by label value hardcoded to "tekton-pipelines". Previous
+	// value "kf" left for backward compatibility
+	managedByRequirement := metav1.LabelSelectorRequirement{Key: v1alpha1.ManagedByLabel,
+		Operator: metav1.LabelSelectorOpIn, Values: []string{v1alpha1.ManagedByKfValue, v1alpha1.ManagedByTektonValue}}
+	labelSelectors.MatchExpressions = []metav1.LabelSelectorRequirement{managedByRequirement}
+	return labelSelectors
+}
 
+func (t *tailer) watchForPods(ctx context.Context, namespace, appName string, writer *LineWriter, opts corev1.PodLogOptions, cfg tailConfig) error {
+	labelSelector := t.labelSelectorForPodLogs(appName, cfg)
 	w, err := t.client.CoreV1().Pods(namespace).Watch(ctx, metav1.ListOptions{
-		LabelSelector: metav1.FormatLabelSelector(metav1.SetAsLabelSelector(selectors)),
+		LabelSelector: metav1.FormatLabelSelector(labelSelector),
 	})
 	if err != nil {
 		return err

pkg/kf/logs/tailer_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 	time "time"
 
-	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	"github.com/google/kf/v2/pkg/kf/logs"
 	"github.com/google/kf/v2/pkg/kf/testutil"
 	corev1 "k8s.io/api/core/v1"
@@ -146,7 +145,7 @@ func TestTailer_Tail(t *testing.T) {
 				logs.WithTailComponentName("app-server"),
 			},
 			setup: func(t *testing.T, cs *fake.Clientset) context.Context {
-				expectedSelector := labels.SelectorFromSet(v1alpha1.AppComponentLabels(defaultAppName, "app-server"))
+				expectedSelector, _ := labels.Parse("app.kubernetes.io/component=app-server,app.kubernetes.io/managed-by in (kf,tekton-pipelines),app.kubernetes.io/name=some-app")
 				cs.PrependWatchReactor("pods", labelSelectorWatchReactor(t, expectedSelector))
 				return context.Background()
 			},