Client changes

Author: Bobbins228

raycluster_webhook/src/main.go

@@ -19,6 +19,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 type ServerParameters struct {
@@ -43,7 +44,8 @@ var (
 	k8sConfig             *rest.Config
 	k8sClientSet          *kubernetes.Clientset
 	serverParameters      ServerParameters
-	k8sClient             client.Client
+	k8Client              client.Client
+	err                   error
 )
 
 func main() {
@@ -54,6 +56,16 @@ func main() {
 
 	k8sClientSet = createClientSet()
 
+	// Get a config to talk to the apiserver
+	cfg := config.GetConfigOrDie()
+
+	// Create a new client
+	err = nil
+	k8Client, err = client.New(cfg, client.Options{})
+	if err != nil {
+		fmt.Errorf(err.Error(), "unable to create a client")
+	}
+
 	// Configure HTTPS server
 	http.HandleFunc("/", HandleRoot)
 	http.HandleFunc("/mutate", HandleMutate)

raycluster_webhook/src/patches.go

@@ -9,6 +9,7 @@ import (
 	routev1 "github.com/openshift/api/route/v1"
 	rayv1api "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -139,15 +140,28 @@ func mtlsPatch(rayCluster *rayv1api.RayCluster, patches []patchOperation, initHe
 	}
 	svcDomain := rayCluster.Name + "-head-svc." + rayCluster.Namespace + ".svc"
 	secretName := `ca-secret-` + rayCluster.Name
+	fmt.Println("Start")
+	domain, err := getDomainName()
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+	fmt.Println("mid")
+	fmt.Printf(domain)
+	fmt.Println("End")
 	if !initHeadExists {
 		if isLocalInteractive {
+			domain, err := getDomainName()
+			if err != nil {
+				return nil, err
+			}
+			rayClientRoute := "rayclient-" + rayCluster.Name + domain
 			initContainerHead = corev1.Container{
 				Name:  "create-cert",
 				Image: "quay.io/project-codeflare/ray:latest-py39-cu118",
 				Command: []string{
 					"sh",
 					"-c",
-					`cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf 'authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${FQ_RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = rayclient-` + rayCluster.Name + `-` + rayCluster.Namespace + `-head-svc.default.svc > ./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext`,
+					`cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${FQ_RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = ` + rayClientRoute + `">./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext`,
 				},
 				VolumeMounts: key_volumes,
 			}
@@ -230,7 +244,6 @@ func mtlsPatch(rayCluster *rayv1api.RayCluster, patches []patchOperation, initHe
 	}
 
 	if !workerHeadExists {
-		fmt.Println("PATCHING WORKER")
 		initContainerWorker := corev1.Container{
 			Name:  "create-cert",
 			Image: "quay.io/project-codeflare/ray:latest-py39-cu118",
@@ -322,13 +335,18 @@ func annotationBoolVal(cluster *rayv1api.RayCluster, annotation string, defaultV
 	return boolVal
 }
 
-func getDomainName() string {
+func getDomainName() (string, error) {
 	consoleRoute := &routev1.Route{}
-	if err := k8sClient.Get(context.TODO(), client.ObjectKey{Name: NameConsoleLink, Namespace: NamespaceConsoleLink}, consoleRoute); err != nil {
-		fmt.Errorf("error getting console route URL %s : %w", NameConsoleLink, err)
-		return "error" //fmt.Errorf("error getting console route URL %s : %w", NameConsoleLink, err)
+	fmt.Println("1")
+	fmt.Printf(client.ObjectKey{Name: NameConsoleLink, Namespace: NamespaceConsoleLink}.String())
+	fmt.Println("2")
+	fmt.Printf(consoleRoute.String())
+
+	if err := k8Client.Get(context.TODO(), types.NamespacedName{Name: NameConsoleLink, Namespace: NamespaceConsoleLink}, consoleRoute); err != nil {
+		return "error getting console route URL %s : %w", err
 	}
+	fmt.Printf("3")
 	domainIndex := strings.Index(consoleRoute.Spec.Host, ".")
 	consoleLinkDomain := consoleRoute.Spec.Host[domainIndex+1:]
-	return consoleLinkDomain
+	return consoleLinkDomain, nil
 }