[WIP] Add kwokctlComponent API

kustomize/kwokctl/component/dashboard.yaml

@@ -0,0 +1,54 @@
+apiVersion: config.kwok.x-k8s.io/v1alpha1
+kind: KwokctlComponent
+metadata:
+  name: dashboard
+parameters:
+  image: ""
+  binary: ""
+  version: "2.7.0"
+  bindAddress: "0.0.0.0"
+  port: 8000
+template: |-
+  {{ $version :=
+    ( or
+      ( env "KWOK_DASHBOARD_VERSION" )
+      .version
+    )
+  }}
+  {{ $image :=
+    ( or 
+      .image
+      ( env "KWOK_DASHBOARD_IMAGE" )
+      ( join
+        "" 
+        ( list 
+          ( or
+            ( env "KWOK_DASHBOARD_IMAGE_PREFIX" )
+            "docker.io/kubernetesui"
+          ) 
+          "/dashboard:v"
+          $version
+        )
+      )
+    )
+  }}
+  image: {{ $image }}
+  binary: {{ .binary }}
+  links:
+  - kube-apiserver
+  ports:
+  - name: http
+    port: {{ .port }}
+    hostPort: {{ .port }}
+    protocol: TCP
+  args:
+  - --insecure-bind-address={{ .bindAddress }}
+  - --insecure-port={{ .port }}
+  - --bind-address=127.0.0.1
+  - --port=0
+  - --enable-insecure-login
+  - --enable-skip-login
+  - --disable-settings-authorizer
+  - --metrics-provider=none
+  - --system-banner=Welcome to {{ ClusterName }}
+  - --kubeconfig={{ Kubeconfig }}

pkg/apis/config/v1alpha1/kwokctl_component_types.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"encoding/json"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	// KwokctlComponentKind is the kind of the kwokctl component.
+	KwokctlComponentKind = "KwokctlComponent"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// KwokctlComponent  holds information about the kwokctl component.
+type KwokctlComponent struct {
+	//+k8s:conversion-gen=false
+	metav1.TypeMeta `json:",inline"`
+	// Standard list metadata.
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	// Parameters is the parameters for the kwokctl component configuration.
+	Parameters json.RawMessage `json:"parameters,omitempty"`
+	// Template is the template for the kwokctl component configuration.
+	Template string `json:"template,omitempty"`
+}

pkg/apis/config/v1alpha1/kwokctl_configuration_types.go

@@ -523,6 +523,10 @@ type Component struct {
 	// MetricsDiscovery is the metrics discovery of the component.
 	MetricsDiscovery *ComponentMetric `json:"metricsDiscovery,omitempty"`
 
+	// Address is the address of the component.
+	// +optional
+	Address string `json:"address,omitempty"`
+
 	// Version is the version of the component.
 	// +optional
 	Version string `json:"version,omitempty"`

pkg/apis/internalversion/conversion.go

@@ -68,6 +68,28 @@ func ConvertToInternalKwokctlResource(in *configv1alpha1.KwokctlResource) (*Kwok
 	return &out, nil
 }
 
+// ConvertToV1alpha1KwokctlComponent converts an internal version KwokctlComponent to a v1alpha1.KwokctlComponent.
+func ConvertToV1alpha1KwokctlComponent(in *KwokctlComponent) (*configv1alpha1.KwokctlComponent, error) {
+	var out configv1alpha1.KwokctlComponent
+	out.APIVersion = configv1alpha1.GroupVersion.String()
+	out.Kind = configv1alpha1.KwokctlComponentKind
+	err := Convert_internalversion_KwokctlComponent_To_v1alpha1_KwokctlComponent(in, &out, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+// ConvertToInternalKwokctlComponent converts a v1alpha1.KwokctlComponent to an internal version.
+func ConvertToInternalKwokctlComponent(in *configv1alpha1.KwokctlComponent) (*KwokctlComponent, error) {
+	var out KwokctlComponent
+	err := Convert_v1alpha1_KwokctlComponent_To_internalversion_KwokctlComponent(in, &out, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
 // ConvertToV1alpha1KwokConfiguration converts an internal version KwokConfiguration to a v1alpha1.KwokConfiguration.
 func ConvertToV1alpha1KwokConfiguration(in *KwokConfiguration) (*configv1alpha1.KwokConfiguration, error) {
 	var out configv1alpha1.KwokConfiguration

pkg/apis/internalversion/kwokctl_component_types.go

@@ -0,0 +1,34 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package internalversion
+
+import (
+	"encoding/json"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// KwokctlComponent provides component definition for kwokctl.
+type KwokctlComponent struct {
+	// Standard list metadata.
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	metav1.ObjectMeta
+	// Parameters is the parameters for the kwokctl component configuration.
+	Parameters json.RawMessage
+	// Template is the template for the kwokctl component configuration.
+	Template string
+}

pkg/apis/internalversion/kwokctl_configuration_types.go

@@ -355,6 +355,9 @@ type Component struct {
 	// MetricsDiscovery is the metrics discovery of the component.
 	MetricsDiscovery *ComponentMetric
 
+	// Address is the address of the component.
+	Address string
+
 	// Version is the version of the component.
 	Version string
 }

pkg/config/config.go

@@ -110,6 +110,12 @@ var configHandlers = map[string]configHandler{
 		MutateToInternal: mutateToInternalConfig(internalversion.ConvertToInternalKwokctlResource),
 		MutateToVersiond: mutateToVersiondConfig(internalversion.ConvertToV1alpha1KwokctlResource),
 	},
+	configv1alpha1.KwokctlComponentKind: {
+		Unmarshal:        unmarshalConfig[*configv1alpha1.KwokctlComponent],
+		Marshal:          marshalConfig,
+		MutateToInternal: mutateToInternalConfig(internalversion.ConvertToInternalKwokctlComponent),
+		MutateToVersiond: mutateToVersiondConfig(internalversion.ConvertToV1alpha1KwokctlComponent),
+	},
 	v1alpha1.StageKind: {
 		Unmarshal:        unmarshalConfig[*v1alpha1.Stage],
 		Marshal:          marshalConfig,

pkg/kwokctl/cmd/scale/scale.go

@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/kwok/pkg/kwokctl/scale"
 	"sigs.k8s.io/kwok/pkg/log"
 	"sigs.k8s.io/kwok/pkg/utils/client"
+	"sigs.k8s.io/kwok/pkg/utils/expression"
 	"sigs.k8s.io/kwok/pkg/utils/slices"
 )
 
@@ -115,7 +116,7 @@ func runE(ctx context.Context, flags *flagpole, args []string) error {
 		}
 	}
 
-	parameters, err := scale.NewParameters(ctx, krc.Parameters, flags.Params)
+	parameters, err := expression.NewParameters(ctx, krc.Parameters, flags.Params)
 	if err != nil {
 		return err
 	}