fix: docker IP handling and use repo Dockerfile (#62)

* fix: docker IP handling

* feat: use Dockerfile

* feat: release v0.0.10

Author: maximiliantech

Dockerfile

@@ -0,0 +1,11 @@
+FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
+ARG TARGETOS
+ARG TARGETARCH
+ARG COMPONENT
+WORKDIR /
+COPY bin/$COMPONENT.$TARGETOS-$TARGETARCH /<component>
+RUN apk add --no-cache docker-cli kind
+USER 65532:65532
+
+# docker doesn't substitue args in ENTRYPOINT, so we replace this during the build script
+ENTRYPOINT ["/<component>"]

Taskfile.yaml

@@ -12,3 +12,4 @@ includes:
       COMPONENTS: 'cluster-provider-kind'
       REPO_URL: 'https://github.com/openmcp-project/cluster-provider-kind'
       CHART_COMPONENTS: "[]"
+      DOCKERFILE: '{{.ROOT_DIR}}/Dockerfile'

VERSION

@@ -1 +1 @@
-v0.0.9-dev
+v0.0.10

internal/controller/accessrequest_controller.go

@@ -102,7 +102,7 @@ func (r *AccessRequestReconciler) handleCreateOrUpdate(ctx context.Context, ar *
 	}
 
 	name := kindName(cluster)
-	kubeconfigStr, err := r.Provider.KubeConfig(name)
+	kubeconfigStr, err := r.Provider.KubeConfig(name, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

internal/controller/cluster_controller.go

@@ -19,6 +19,7 @@ package controller
 import (
 	"context"
 	"fmt"
+	"os"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -151,7 +152,7 @@ func (r *ClusterReconciler) handleCreateOrUpdate(ctx context.Context, cluster *c
 		Reason: "ClusterExists",
 	})
 
-	kubeconfig, err := r.Provider.KubeConfig(name)
+	kubeconfig, err := r.Provider.KubeConfig(name, runsOnLocalHost())
 	if err != nil {
 		return requeue.Error(err)
 	}
@@ -238,3 +239,8 @@ func namespaceOrDefault(namespace string) string {
 func isClusterProviderResponsible(cluster *clustersv1alpha1.Cluster) bool {
 	return cluster.Spec.Profile == profileKind
 }
+
+// runsOnLocalHost returns true if the KIND_ON_LOCAL_HOST environment variable is set to "true".
+func runsOnLocalHost() bool {
+	return os.Getenv("KIND_ON_LOCAL_HOST") == "true"
+}

pkg/kind/provider.go

@@ -24,8 +24,8 @@ type Provider interface {
 	// ClusterExists checks if a Kubernetes cluster with the given name exists.
 	ClusterExists(name string) (bool, error)
 
-	// KubeConfig retrieves the kubeconfig for the specified cluster name.
-	KubeConfig(name string) (string, error)
+	// KubeConfig retrieves the kubeconfig for the specified cluster name. The bool localhosts indicates whether the function returns a kubeconfig with the local host IP or the container IP.
+	KubeConfig(name string, localhost bool) (string, error)
 }
 
 var (
@@ -73,8 +73,8 @@ func (p *kindProvider) DeleteCluster(name string) error {
 }
 
 // KubeConfig implements Provider.
-func (p *kindProvider) KubeConfig(name string) (string, error) {
-	kubeconfigStr, err := p.internal.KubeConfig(name, !runsOnLocalHost())
+func (p *kindProvider) KubeConfig(name string, localhost bool) (string, error) {
+	kubeconfigStr, err := p.internal.KubeConfig(name, !localhost)
 	if err != nil {
 		return "", err
 	}
@@ -89,11 +89,6 @@ func (p *kindProvider) KubeConfig(name string) (string, error) {
 	return strings.ReplaceAll(kubeconfigStr, "https://"+containerName, "https://"+containerIP.String()), nil
 }
 
-// runsOnLocalHost returns true if the KIND_ON_LOCAL_HOST environment variable is set to "true".
-func runsOnLocalHost() bool {
-	return os.Getenv("KIND_ON_LOCAL_HOST") == "true"
-}
-
 func (p *kindProvider) controlPlaneContainer(name string) string {
 	return fmt.Sprintf("%s-control-plane", name)
 }