kubernetes api: renamed in order to avoid hyphens

src/kubernetes-api/Makefile

 
 # Image URL to use all building/pushing image targets
-IMG ?= alexdecb/l2sm-operator:2.4
+IMG ?= alexdecb/l2sm-controller-manager:2.4
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.29.0
 

src/kubernetes-api/PROJECT

@@ -5,8 +5,8 @@
 domain: l2sm.k8s.local
 layout:
 - go.kubebuilder.io/v4
-projectName: l2sm-kapi
-repo: l2sm.k8s.local/l2sm-kapi
+projectName: controllermanager
+repo: l2sm.k8s.local/controllermanager
 resources:
 - api:
     crdVersion: v1
@@ -15,7 +15,7 @@ resources:
   domain: l2sm.k8s.local
   group: l2sm
   kind: L2Network
-  path: l2sm.k8s.local/l2sm-kapi/api/v1
+  path: l2sm.k8s.local/controllermanager/api/v1
   version: v1
 - controller: true
   group: core
@@ -29,7 +29,7 @@ resources:
   domain: l2sm.k8s.local
   group: l2sm
   kind: NetworkEdgeDevice
-  path: l2sm.k8s.local/l2sm-kapi/api/v1
+  path: l2sm.k8s.local/controllermanager/api/v1
   version: v1
 - api:
     crdVersion: v1
@@ -38,6 +38,6 @@ resources:
   domain: l2sm.k8s.local
   group: l2sm
   kind: Overlay
-  path: l2sm.k8s.local/l2sm-kapi/api/v1
+  path: l2sm.k8s.local/controllermanager/api/v1
   version: v1
 version: "3"

src/kubernetes-api/cmd/main.go

@@ -34,8 +34,8 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
-	"l2sm.k8s.local/l2sm-kapi/internal/controller"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
+	"l2sm.k8s.local/controllermanager/internal/controller"
 	//+kubebuilder:scaffold:imports
 )
 

src/kubernetes-api/config/rbac/overlay_editor_role.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: overlay-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: l2sm-kapi
-    app.kubernetes.io/part-of: l2sm-kapi
+    app.kubernetes.io/created-by: controllermanager
+    app.kubernetes.io/part-of: controllermanager
     app.kubernetes.io/managed-by: kustomize
   name: overlay-editor-role
 rules:

src/kubernetes-api/config/rbac/overlay_viewer_role.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: overlay-viewer-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: l2sm-kapi
-    app.kubernetes.io/part-of: l2sm-kapi
+    app.kubernetes.io/created-by: controllermanager
+    app.kubernetes.io/part-of: controllermanager
     app.kubernetes.io/managed-by: kustomize
   name: overlay-viewer-role
 rules:

src/kubernetes-api/config/samples/l2sm_v1_overlay.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: overlay
     app.kubernetes.io/instance: overlay-sample
-    app.kubernetes.io/part-of: l2sm-kapi
+    app.kubernetes.io/part-of: controllermanager
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: l2sm-kapi
+    app.kubernetes.io/created-by: controllermanager
   name: overlay-sample
 spec:
   # TODO(user): Add fields here

src/kubernetes-api/go.mod

-module l2sm.k8s.local/l2sm-kapi
+module l2sm.k8s.local/controllermanager
 
 go 1.21
 

src/kubernetes-api/internal/controller/l2network_controller.go

@@ -28,9 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
-	"l2sm.k8s.local/l2sm-kapi/internal/sdnclient"
-	"l2sm.k8s.local/l2sm-kapi/internal/utils"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
+	"l2sm.k8s.local/controllermanager/internal/sdnclient"
+	"l2sm.k8s.local/controllermanager/internal/utils"
 )
 
 // L2NetworkReconciler reconciles a L2Network object
@@ -150,7 +150,7 @@ func (r *L2NetworkReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Log.Info("this is the controller ip", os.Getenv("CONTROLLER_IP"))
 	fmt.Println(os.Getenv("CONTROLLER_IP"))
 	// Initialize the InternalClient with the base URL of the SDN controller
-	clientConfig := sdnclient.ClientConfig{BaseURL: fmt.Sprintf("http://%s:8181/onos/v1", os.Getenv("CONTROLLER_IP")), Username: "karaf", Password: "karaf"}
+	clientConfig := sdnclient.ClientConfig{BaseURL: fmt.Sprintf("http://%s:8181/onos", os.Getenv("CONTROLLER_IP")), Username: "karaf", Password: "karaf"}
 
 	r.InternalClient, err = sdnclient.NewClient(sdnclient.InternalType, clientConfig)
 	if err != nil {

src/kubernetes-api/internal/controller/l2network_controller_test.go

@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 var _ = Describe("L2Network Controller", func() {

src/kubernetes-api/internal/controller/networkedgedevice_controller.go

@@ -26,8 +26,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
-	"l2sm.k8s.local/l2sm-kapi/internal/utils"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
+	"l2sm.k8s.local/controllermanager/internal/utils"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

src/kubernetes-api/internal/controller/networkedgedevice_controller_test.go

@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 var _ = Describe("NetworkEdgeDevice Controller", func() {

src/kubernetes-api/internal/controller/overlay_controller.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 // OverlayReconciler reconciles a Overlay object

src/kubernetes-api/internal/controller/overlay_controller_test.go

@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 var _ = Describe("Overlay Controller", func() {

src/kubernetes-api/internal/controller/suite_test.go

@@ -34,7 +34,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

src/kubernetes-api/internal/sdnclient/client.go

@@ -3,7 +3,7 @@ package sdnclient
 import (
 	"errors"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 type ClientType string
@@ -37,7 +37,7 @@ func NewClient(clientType ClientType, config ClientConfig) (Client, error) {
 		}
 		return client, nil
 	case ExternalType:
-		client := &ExternalClient{Session: sessionClient} // Adjust ExternalClient struct accordingly
+		client := &ExternalClient{Session: sessionClient}
 		if !client.beginSessionController() {
 			return nil, errors.New("could not initialize session with SDN controller. Please check the connection details and credentials.")
 		}

src/kubernetes-api/internal/sdnclient/external_client.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 // ExternalClient is part of the Client interface, and implements the SessionClient, which is a wrapper of the http function

src/kubernetes-api/internal/sdnclient/internal_client.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	l2smv1 "l2sm.k8s.local/l2sm-kapi/api/v1"
+	l2smv1 "l2sm.k8s.local/controllermanager/api/v1"
 )
 
 // InternalClient is part of the Client interface, and implements the SessionClient, which is a wrapper of the http function.
@@ -19,12 +19,15 @@ type VnetPayload struct {
 }
 
 func (c *InternalClient) beginSessionController() bool {
-	resp, err := c.Session.Get("/l2sm/networks/status")
+	resp, err := c.Session.Get("/vnets/api/status")
+	fmt.Println("Getting it")
 	if err != nil {
+		fmt.Println(err)
 		return false
 	}
 	defer resp.Body.Close()
 
+	fmt.Println(resp.StatusCode)
 	// Check if the status code indicates success (HTTP 200 OK).
 	return resp.StatusCode == http.StatusOK
 }
@@ -33,12 +36,12 @@ func (c *InternalClient) beginSessionController() bool {
 func (c *InternalClient) CreateNetwork(networkType l2smv1.NetworkType, config interface{}) error {
 
 	//TODO: Remove hard-code
-	networkType = "networks"
+	networkType = "vnets"
 	jsonData, err := json.Marshal(config)
 	if err != nil {
 		return err
 	}
-	response, err := c.Session.Post(fmt.Sprintf("/l2sm/%s", networkType), jsonData)
+	response, err := c.Session.Post(fmt.Sprintf("/%s/api", networkType), jsonData)
 	if err != nil {
 		return err
 	}
@@ -53,9 +56,9 @@ func (c *InternalClient) CreateNetwork(networkType l2smv1.NetworkType, config in
 
 // CheckNetworkExists checks if the specified network exists in the SDN controller
 func (c *InternalClient) CheckNetworkExists(networkType l2smv1.NetworkType, networkID string) (bool, error) {
-	networkType = "networks"
+	networkType = "vnets"
 
-	response, err := c.Session.Get(fmt.Sprintf("/l2sm/%s/%s", networkType, networkID))
+	response, err := c.Session.Get(fmt.Sprintf("/%s/api/%s", networkType, networkID))
 	if err != nil {
 		return false, err
 	}
@@ -66,9 +69,9 @@ func (c *InternalClient) CheckNetworkExists(networkType l2smv1.NetworkType, netw
 
 // DeleteNetwork deletes an existing network from the SDN controller
 func (c *InternalClient) DeleteNetwork(networkType l2smv1.NetworkType, networkID string) error {
-	networkType = "networks"
+	networkType = "vnets"
 
-	response, err := c.Session.Delete(fmt.Sprintf("/l2sm/%s/%s", networkType, networkID))
+	response, err := c.Session.Delete(fmt.Sprintf("/%s/api/%s", networkType, networkID))
 	if err != nil {
 		return err
 	}

src/kubernetes-api/test/e2e/e2e_test.go

@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"l2sm.k8s.local/l2sm-kapi/test/utils"
+	"l2sm.k8s.local/controllermanager/test/utils"
 )
 
 const namespace = "l2network-system"