[mq] working branch - merge 7db47bf on top of main at 3fd9f96

{"baseBranch":"main","baseCommit":"3fd9f96b6d3bfaea50455c830eeb4595631bca67","createdAt":"2025-10-29T14:14:19.186641Z","headSha":"7db47bfee5afcb0d5d1dc7952a35b31f4b95c271","id":"8a8b0698-dc15-4220-aa1c-41fac9387aaf","priority":"200","pullRequestNumber":"1736","queuedAt":"2025-10-29T14:14:19.185918Z","status":"STATUS_QUEUED"}

Author: dd-mergequeue[bot]

common/config/environment.go

@@ -27,6 +27,8 @@ const (
 	// Infra namespace
 	DDInfraEnvironment                      = "env"
 	DDInfraKubernetesVersion                = "kubernetesVersion"
+	DDInfraKindVersion                      = "kindVersion"
+	DDInfraKubeNodeURL                      = "kubeNodeUrl"
 	DDInfraOSDescriptor                     = "osDescriptor" // osDescriptor is expected in the format: <osFamily>:<osVersion>:<osArch>, see components/os/descriptor.go
 	DDInfraOSImageID                        = "osImageID"
 	DDInfraOSImageIDUseLatest               = "osImageIDUseLatest"
@@ -110,6 +112,8 @@ type Env interface {
 	InfraOSDescriptor() string
 	InfraOSImageID() string
 	KubernetesVersion() string
+	KubeNodeURL() string
+	KindVersion() string
 	DefaultResourceTags() map[string]string
 	ExtraResourcesTags() map[string]string
 	ResourcesTags() pulumi.StringMapInput
@@ -226,6 +230,14 @@ func (e *CommonEnvironment) KubernetesVersion() string {
 	return e.GetStringWithDefault(e.InfraConfig, DDInfraKubernetesVersion, "1.32")
 }
 
+func (e *CommonEnvironment) KindVersion() string {
+	return e.GetStringWithDefault(e.InfraConfig, DDInfraKindVersion, "v0.30.0")
+}
+
+func (e *CommonEnvironment) KubeNodeURL() string {
+	return e.GetStringWithDefault(e.InfraConfig, DDInfraKubeNodeURL, "")
+}
+
 func (e *CommonEnvironment) DefaultResourceTags() map[string]string {
 	return map[string]string{"managed-by": "pulumi", "username": e.username}
 }

components/kubernetes/kind.go

@@ -3,6 +3,7 @@ package kubernetes
 import (
 	_ "embed"
 	"fmt"
+	"log"
 	"regexp"
 	"strings"
 
@@ -30,6 +31,20 @@ func NewKindCluster(env config.Env, vm *remote.Host, name string, kubeVersion st
 	return NewKindClusterWithConfig(env, vm, name, kubeVersion, kindClusterConfig, opts...)
 }
 
+func validateKubeVersionFormat(kubeVersion string) error {
+	// Pattern: v{semver}@sha256:{hash}
+	// Example: v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
+	pattern := `^v\d+\.\d+\.\d+@sha256:[a-f0-9]{64}$`
+	matched, err := regexp.MatchString(pattern, kubeVersion)
+	if err != nil {
+		return fmt.Errorf("error validating kubeVersion format: %w", err)
+	}
+	if !matched {
+		return fmt.Errorf("kubeVersion must be in format 'v{semver}@sha256:{hash}' (e.g., v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027), got: %s", kubeVersion)
+	}
+	return nil
+}
+
 func NewKindClusterWithConfig(env config.Env, vm *remote.Host, name string, kubeVersion, kindConfig string, opts ...pulumi.ResourceOption) (*Cluster, error) {
 	return components.NewComponent(env, name, func(clusterComp *Cluster) error {
 		kindClusterName := env.CommonNamer().DisplayName(49) // We can have some issues if the name is longer than 50 characters
@@ -48,9 +63,25 @@ func NewKindClusterWithConfig(env config.Env, vm *remote.Host, name string, kube
 		}
 		opts = utils.MergeOptions(opts, utils.PulumiDependsOn(dockerManager, curlCommand))
 
+		/*
+			We'll first try to resolve the kind version and node image from our static map, if we can't find
+			it (ex. 1.34 not in our map yet), we'll continue because we have the ability to pull down arbitrary
+			versions from the mirror - although it should be noted the sha is required. So sometimes the version is
+			just the tag, and sometimes it's the tag with the sha.
+		*/
 		kindVersionConfig, err := GetKindVersionConfig(kubeVersion)
 		if err != nil {
-			return err
+			log.Printf("[WARN] Could not find version %s in our static map, using default kind version and the provided k8s version as node image", kubeVersion)
+
+			// Validate the kubeVersion format when not in static map
+			if err := validateKubeVersionFormat(kubeVersion); err != nil {
+				return err
+			}
+
+			kindVersionConfig = &KindConfig{
+				KindVersion:      env.KindVersion(),
+				NodeImageVersion: kubeVersion,
+			}
 		}
 
 		kindInstall, err := InstallKindBinary(env, vm, kindVersionConfig.KindVersion, opts...)
@@ -66,7 +97,18 @@ func NewKindClusterWithConfig(env config.Env, vm *remote.Host, name string, kube
 			return err
 		}
 
-		nodeImage := fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.NodeImageVersion)
+		/*
+			The internal mirror should be able to pull arbitrary kubernetes images but the sha is required
+			with the tag. We also support the user supplying the url (in case we want to host
+			kubernetes rc candidates in some registry, etc)
+		*/
+		var nodeImage string
+		if env.KubeNodeURL() != "" {
+			nodeImage = env.KubeNodeURL()
+		} else {
+			nodeImage = fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.NodeImageVersion)
+		}
+		log.Printf("[INFO] Resolved node image url: %s", nodeImage)
 		createCluster, err := runner.Command(
 			commonEnvironment.CommonNamer().ResourceName("kind-create-cluster"),
 			&command.Args{