Fix deprecated calls (#4570)

apis/actions.github.com/v1alpha1/autoscalinglistener_types.go

@@ -118,7 +118,3 @@ type AutoscalingListenerList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AutoscalingListener `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&AutoscalingListener{}, &AutoscalingListenerList{})
-}

apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go

@@ -408,7 +408,3 @@ type AutoscalingRunnerSetList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AutoscalingRunnerSet `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&AutoscalingRunnerSet{}, &AutoscalingRunnerSetList{})
-}

apis/actions.github.com/v1alpha1/ephemeralrunner_types.go

@@ -228,7 +228,3 @@ type EphemeralRunnerList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []EphemeralRunner `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&EphemeralRunner{}, &EphemeralRunnerList{})
-}

apis/actions.github.com/v1alpha1/ephemeralrunnerset_types.go

@@ -110,7 +110,3 @@ type EphemeralRunnerSetList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []EphemeralRunnerSet `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&EphemeralRunnerSet{}, &EphemeralRunnerSetList{})
-}

apis/actions.github.com/v1alpha1/groupversion_info.go

@@ -20,8 +20,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
@@ -29,8 +30,23 @@ var (
 	GroupVersion = schema.GroupVersion{Group: "actions.github.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&AutoscalingListener{},
+		&AutoscalingListenerList{},
+		&AutoscalingRunnerSet{},
+		&AutoscalingRunnerSetList{},
+		&EphemeralRunner{},
+		&EphemeralRunnerList{},
+		&EphemeralRunnerSet{},
+		&EphemeralRunnerSetList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

apis/actions.github.com/v1alpha1/zz_generated.deepcopy.go

@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.

apis/actions.summerwind.net/v1alpha1/groupversion_info.go

@@ -20,8 +20,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
@@ -29,8 +30,25 @@ var (
 	GroupVersion = schema.GroupVersion{Group: "actions.summerwind.dev", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&HorizontalRunnerAutoscaler{},
+		&HorizontalRunnerAutoscalerList{},
+		&Runner{},
+		&RunnerList{},
+		&RunnerDeployment{},
+		&RunnerDeploymentList{},
+		&RunnerReplicaSet{},
+		&RunnerReplicaSetList{},
+		&RunnerSet{},
+		&RunnerSetList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

apis/actions.summerwind.net/v1alpha1/horizontalrunnerautoscaler_types.go

@@ -263,7 +263,3 @@ type HorizontalRunnerAutoscalerList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []HorizontalRunnerAutoscaler `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&HorizontalRunnerAutoscaler{}, &HorizontalRunnerAutoscalerList{})
-}

apis/actions.summerwind.net/v1alpha1/runner_types.go

@@ -402,7 +402,3 @@ type RunnerList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Runner `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Runner{}, &RunnerList{})
-}

apis/actions.summerwind.net/v1alpha1/runnerdeployment_types.go

@@ -105,7 +105,3 @@ type RunnerDeploymentList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RunnerDeployment `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RunnerDeployment{}, &RunnerDeploymentList{})
-}

apis/actions.summerwind.net/v1alpha1/runnerreplicaset_types.go

@@ -88,7 +88,3 @@ type RunnerReplicaSetList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RunnerReplicaSet `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RunnerReplicaSet{}, &RunnerReplicaSetList{})
-}

apis/actions.summerwind.net/v1alpha1/runnerset_types.go

@@ -96,7 +96,3 @@ type RunnerSetList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RunnerSet `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RunnerSet{}, &RunnerSetList{})
-}

apis/actions.summerwind.net/v1alpha1/zz_generated.deepcopy.go

@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.

charts/gha-runner-scale-set-controller/tests/template_test.go

@@ -33,7 +33,7 @@ func TestTemplate_CreateServiceAccount(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -44,7 +44,7 @@ func TestTemplate_CreateServiceAccount(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
 
 	var serviceAccount corev1.ServiceAccount
 	helm.UnmarshalK8SYaml(t, output, &serviceAccount)
@@ -62,7 +62,7 @@ func TestTemplate_CreateServiceAccount_OverwriteName(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -74,7 +74,7 @@ func TestTemplate_CreateServiceAccount_OverwriteName(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
 
 	var serviceAccount corev1.ServiceAccount
 	helm.UnmarshalK8SYaml(t, output, &serviceAccount)
@@ -92,7 +92,7 @@ func TestTemplate_CreateServiceAccount_CannotUseDefaultServiceAccount(t *testing
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -104,7 +104,7 @@ func TestTemplate_CreateServiceAccount_CannotUseDefaultServiceAccount(t *testing
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
 	assert.ErrorContains(t, err, "serviceAccount.name cannot be set to 'default'", "We should get an error because the default service account cannot be used")
 }
 
@@ -116,7 +116,7 @@ func TestTemplate_NotCreateServiceAccount(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -128,7 +128,7 @@ func TestTemplate_NotCreateServiceAccount(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/serviceaccount.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/serviceaccount.yaml in chart", "We should get an error because the template should be skipped")
 }
 
@@ -140,7 +140,7 @@ func TestTemplate_NotCreateServiceAccount_ServiceAccountNotSet(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -151,7 +151,7 @@ func TestTemplate_NotCreateServiceAccount_ServiceAccountNotSet(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 	assert.ErrorContains(t, err, "serviceAccount.name must be set if serviceAccount.create is false", "We should get an error because the default service account cannot be used")
 }
 
@@ -163,7 +163,7 @@ func TestTemplate_CreateManagerClusterRole(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger:         logger.Discard,
@@ -171,7 +171,7 @@ func TestTemplate_CreateManagerClusterRole(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_cluster_role.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_cluster_role.yaml"})
 
 	var managerClusterRole rbacv1.ClusterRole
 	helm.UnmarshalK8SYaml(t, output, &managerClusterRole)
@@ -180,10 +180,10 @@ func TestTemplate_CreateManagerClusterRole(t *testing.T) {
 	assert.Equal(t, "test-arc-gha-rs-controller", managerClusterRole.Name)
 	assert.Equal(t, 16, len(managerClusterRole.Rules))
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_single_namespace_controller_role.yaml in chart", "We should get an error because the template should be skipped")
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_single_namespace_watch_role.yaml in chart", "We should get an error because the template should be skipped")
 }
 
@@ -195,7 +195,7 @@ func TestTemplate_ManagerClusterRoleBinding(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -205,7 +205,7 @@ func TestTemplate_ManagerClusterRoleBinding(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_cluster_role_binding.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_cluster_role_binding.yaml"})
 
 	var managerClusterRoleBinding rbacv1.ClusterRoleBinding
 	helm.UnmarshalK8SYaml(t, output, &managerClusterRoleBinding)
@@ -216,10 +216,10 @@ func TestTemplate_ManagerClusterRoleBinding(t *testing.T) {
 	assert.Equal(t, "test-arc-gha-rs-controller", managerClusterRoleBinding.Subjects[0].Name)
 	assert.Equal(t, namespaceName, managerClusterRoleBinding.Subjects[0].Namespace)
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role_binding.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role_binding.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_single_namespace_controller_role_binding.yaml in chart", "We should get an error because the template should be skipped")
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role_binding.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role_binding.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_single_namespace_watch_role_binding.yaml in chart", "We should get an error because the template should be skipped")
 }
 
@@ -231,7 +231,7 @@ func TestTemplate_CreateManagerListenerRole(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger:         logger.Discard,
@@ -239,7 +239,7 @@ func TestTemplate_CreateManagerListenerRole(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_listener_role.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_listener_role.yaml"})
 
 	var managerListenerRole rbacv1.Role
 	helm.UnmarshalK8SYaml(t, output, &managerListenerRole)
@@ -261,7 +261,7 @@ func TestTemplate_ManagerListenerRoleBinding(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -271,7 +271,7 @@ func TestTemplate_ManagerListenerRoleBinding(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_listener_role_binding.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_listener_role_binding.yaml"})
 
 	var managerListenerRoleBinding rbacv1.RoleBinding
 	helm.UnmarshalK8SYaml(t, output, &managerListenerRoleBinding)
@@ -298,7 +298,7 @@ func TestTemplate_ControllerDeployment_Defaults(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -308,7 +308,7 @@ func TestTemplate_ControllerDeployment_Defaults(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -399,7 +399,7 @@ func TestTemplate_ControllerDeployment_Customize(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -441,7 +441,7 @@ func TestTemplate_ControllerDeployment_Customize(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -552,7 +552,7 @@ func TestTemplate_EnableLeaderElectionRole(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -562,7 +562,7 @@ func TestTemplate_EnableLeaderElectionRole(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/leader_election_role.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/leader_election_role.yaml"})
 
 	var leaderRole rbacv1.Role
 	helm.UnmarshalK8SYaml(t, output, &leaderRole)
@@ -579,7 +579,7 @@ func TestTemplate_EnableLeaderElectionRoleBinding(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -589,7 +589,7 @@ func TestTemplate_EnableLeaderElectionRoleBinding(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/leader_election_role_binding.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/leader_election_role_binding.yaml"})
 
 	var leaderRoleBinding rbacv1.RoleBinding
 	helm.UnmarshalK8SYaml(t, output, &leaderRoleBinding)
@@ -608,7 +608,7 @@ func TestTemplate_EnableLeaderElection(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -619,7 +619,7 @@ func TestTemplate_EnableLeaderElection(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -660,7 +660,7 @@ func TestTemplate_ControllerDeployment_ForwardImagePullSecrets(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -671,7 +671,7 @@ func TestTemplate_ControllerDeployment_ForwardImagePullSecrets(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -708,7 +708,7 @@ func TestTemplate_ControllerDeployment_WatchSingleNamespace(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -719,7 +719,7 @@ func TestTemplate_ControllerDeployment_WatchSingleNamespace(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -804,7 +804,7 @@ func TestTemplate_ControllerContainerEnvironmentVariables(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -822,7 +822,7 @@ func TestTemplate_ControllerContainerEnvironmentVariables(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -851,7 +851,7 @@ func TestTemplate_WatchSingleNamespace_NotCreateManagerClusterRole(t *testing.T)
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -861,7 +861,7 @@ func TestTemplate_WatchSingleNamespace_NotCreateManagerClusterRole(t *testing.T)
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_cluster_role.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_cluster_role.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_cluster_role.yaml in chart", "We should get an error because the template should be skipped")
 }
 
@@ -873,7 +873,7 @@ func TestTemplate_WatchSingleNamespace_NotManagerClusterRoleBinding(t *testing.T
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -884,7 +884,7 @@ func TestTemplate_WatchSingleNamespace_NotManagerClusterRoleBinding(t *testing.T
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	_, err = helm.RenderTemplateE(t, options, helmChartPath, releaseName, []string{"templates/manager_cluster_role_binding.yaml"})
+	_, err = helm.RenderTemplateContextE(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_cluster_role_binding.yaml"})
 	assert.ErrorContains(t, err, "could not find template templates/manager_cluster_role_binding.yaml in chart", "We should get an error because the template should be skipped")
 }
 
@@ -896,7 +896,7 @@ func TestTemplate_CreateManagerSingleNamespaceRole(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -906,7 +906,7 @@ func TestTemplate_CreateManagerSingleNamespaceRole(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role.yaml"})
 
 	var managerSingleNamespaceControllerRole rbacv1.Role
 	helm.UnmarshalK8SYaml(t, output, &managerSingleNamespaceControllerRole)
@@ -915,7 +915,7 @@ func TestTemplate_CreateManagerSingleNamespaceRole(t *testing.T) {
 	assert.Equal(t, namespaceName, managerSingleNamespaceControllerRole.Namespace)
 	assert.Equal(t, 10, len(managerSingleNamespaceControllerRole.Rules))
 
-	output = helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role.yaml"})
+	output = helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role.yaml"})
 
 	var managerSingleNamespaceWatchRole rbacv1.Role
 	helm.UnmarshalK8SYaml(t, output, &managerSingleNamespaceWatchRole)
@@ -933,7 +933,7 @@ func TestTemplate_ManagerSingleNamespaceRoleBinding(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -943,7 +943,7 @@ func TestTemplate_ManagerSingleNamespaceRoleBinding(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role_binding.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_controller_role_binding.yaml"})
 
 	var managerSingleNamespaceControllerRoleBinding rbacv1.RoleBinding
 	helm.UnmarshalK8SYaml(t, output, &managerSingleNamespaceControllerRoleBinding)
@@ -954,7 +954,7 @@ func TestTemplate_ManagerSingleNamespaceRoleBinding(t *testing.T) {
 	assert.Equal(t, "test-arc-gha-rs-controller", managerSingleNamespaceControllerRoleBinding.Subjects[0].Name)
 	assert.Equal(t, namespaceName, managerSingleNamespaceControllerRoleBinding.Subjects[0].Namespace)
 
-	output = helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role_binding.yaml"})
+	output = helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/manager_single_namespace_watch_role_binding.yaml"})
 
 	var managerSingleNamespaceWatchRoleBinding rbacv1.RoleBinding
 	helm.UnmarshalK8SYaml(t, output, &managerSingleNamespaceWatchRoleBinding)
@@ -981,7 +981,7 @@ func TestControllerDeployment_MetricsPorts(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -994,7 +994,7 @@ func TestControllerDeployment_MetricsPorts(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -1053,7 +1053,7 @@ func TestDeployment_excludeLabelPropagationPrefixes(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
+	namespaceName := "test-" + strings.ToLower(random.UniqueID())
 
 	options := &helm.Options{
 		Logger: logger.Discard,
@@ -1064,7 +1064,7 @@ func TestDeployment_excludeLabelPropagationPrefixes(t *testing.T) {
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
 
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
+	output := helm.RenderTemplateContext(t, t.Context(), options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
 
 	var deployment appsv1.Deployment
 	helm.UnmarshalK8SYaml(t, output, &deployment)
@@ -1082,8 +1082,8 @@ func TestNamespaceOverride(t *testing.T) {
 	chartPath := "../../gha-runner-scale-set-controller"
 
 	releaseName := "test"
-	releaseNamespace := "test-" + strings.ToLower(random.UniqueId())
+	releaseNamespace := "test-" + strings.ToLower(random.UniqueID())
-	namespaceOverride := "test-" + strings.ToLower(random.UniqueId())
+	namespaceOverride := "test-" + strings.ToLower(random.UniqueID())
 
 	tt := map[string]struct {
 		file          string
@@ -1205,7 +1205,7 @@ func TestNamespaceOverride(t *testing.T) {
 			t.Parallel()
 			templateFile := filepath.Join("./templates", c.file)
 
-			output, err := helm.RenderTemplateE(t, c.options, chartPath, releaseName, []string{templateFile})
+			output, err := helm.RenderTemplateContextE(t, t.Context(), c.options, chartPath, releaseName, []string{templateFile})
 			if err != nil {
 				t.Errorf("Error rendering template %s from chart %s: %s", c.file, chartPath, err)
 			}