refactor api and methodes

Author: maxencecolmant

chart/goserv/values.yaml

@@ -4,7 +4,7 @@ replicaCount: 1
 revisionHistoryLimit: 1
 image:
   repository: maxencecolmant/goapi
-  tag: kub-1
+  tag: iks-new
   pullPolicy: IfNotPresent
   resources:
     requests:

configkub/config.go

@@ -1,4 +1,5 @@
 package configkub
+
 import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/typed/core/v1"
@@ -10,6 +11,7 @@ import (
 
 func Getconfig() v1.CoreV1Interface {
 
+	//config, err := rest.InClusterConfig()
 	kubeConfigPath, _ := os.LookupEnv("KUBECONFIG")
 	config, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
 	if err != nil {

exec/routes.go

@@ -1,27 +1,27 @@
 package exec
 
 import (
-	"fmt"
 	"github.com/gorilla/mux"
 	"log"
 	"main/pkg"
 	"net/http"
+	"encoding/json"
 )
 
 func GetRoutes() {
 	router := mux.NewRouter().StrictSlash(true)
 	router.HandleFunc("/", project)
-	router.HandleFunc("/api/namespaces", pkg.GetNs)
-	router.HandleFunc("/api/pods", pkg.GetPods)
-	router.HandleFunc("/api/nodes", pkg.GetNodes)
-	router.HandleFunc("/api/services", pkg.GetServices)
-	router.HandleFunc("/api/namespaces/{nsname}", pkg.GetNsName)
-	router.HandleFunc("/api/namespaces/create/{nsname}", pkg.CreateNs)
-	router.HandleFunc("/api/namespaces/delete/{nsname}", pkg.DeleteNs)
+	router.HandleFunc("/api/namespaces", pkg.GetNs).Methods("GET")
+	router.HandleFunc("/api/pods", pkg.GetPods).Methods("GET")
+	router.HandleFunc("/api/nodes", pkg.GetNodes).Methods("GET")
+	router.HandleFunc("/api/services", pkg.GetServices).Methods("GET")
+	router.HandleFunc("/api/namespaces/{nsname}", pkg.GetNsName).Methods("GET")
+	router.HandleFunc("/api/namespaces/{nsname}", pkg.CreateNs).Methods("POST")
+	router.HandleFunc("/api/namespaces/{nsname}", pkg.DeleteNs).Methods("DELETE")
 	log.Fatal(http.ListenAndServe(":8080", router))
 }
 
 func project(w http.ResponseWriter, r *http.Request) {
 	project := "api go kubernetes iks"
-	fmt.Fprint(w, project)
+	json.NewEncoder(w).Encode(project)
 }

main.go

@@ -4,10 +4,5 @@ import (
 	"main/exec"
 )
 func main() {
-
 	exec.GetRoutes()
-}
-
-
-
-
+}

pkg/namespaces.go

@@ -1,6 +1,7 @@
 package pkg
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gorilla/mux"
 	v1 "k8s.io/api/core/v1"
@@ -31,7 +32,7 @@ func GetNs(w http.ResponseWriter, r *http.Request) {
 		log.Fatal(err)
 	}
 
-	fmt.Fprint( w, ns )
+	json.NewEncoder(w).Encode(ns)
 }
 
 
@@ -46,11 +47,11 @@ func GetNsName(w http.ResponseWriter, r *http.Request) {
 	//listOptions := m
 	ns, err := api.Namespaces().Get(nsname,getoption )
 	if err != nil {
-		fmt.Fprint(w,"This namespace doesn't exist")
+		json.NewEncoder(w).Encode("This Namespace doesn't exist")
 	}
 
 
-	fmt.Fprint( w, ns)
+	json.NewEncoder(w).Encode(ns)
 
 }
 
@@ -74,6 +75,7 @@ func CreateNs(w http.ResponseWriter, r *http.Request)  {
 		fmt.Fprint(w,"The namespace ", nsname," already exist")
 	}else {
 		fmt.Fprint( w, "The namespace : ",ns.Name," have been created")
+		json.NewEncoder(w).Encode(ns)
 	}
 }
 
@@ -93,5 +95,4 @@ func DeleteNs(w http.ResponseWriter, r *http.Request)  {
 		fmt.Fprint(w ,"The namespace ", nsname, " have been deleted")
 	}
 
-
 }

pkg/nodes.go

@@ -1,20 +1,20 @@
 package pkg
 
-
 import (
-"fmt"
-metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-"log"
-"main/configkub"
-"net/http"
+	"encoding/json"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"log"
+	"main/configkub"
+	"net/http"
 )
 
 func GetNodes(w http.ResponseWriter, r *http.Request) {
 	api := configkub.Getconfig()
 	listOptions := metav1.ListOptions{}
-	pods, err := api.Nodes().List(listOptions)
+	nodes, err := api.Nodes().List(listOptions)
 	if err != nil {
 		log.Fatal(err)
 	}
-	fmt.Fprint( w, pods )
-}
+	json.NewEncoder(w).Encode(nodes.Items)
+	
+}

pkg/pods.go

@@ -1,7 +1,7 @@
 package pkg
 
 import (
-	"fmt"
+	"encoding/json"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"log"
 	"main/configkub"
@@ -15,7 +15,8 @@ func GetPods(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	fmt.Fprint( w, pods )
+	json.NewEncoder(w).Encode(pods.Items)
+
 
 
 }

pkg/services.go

@@ -1,8 +1,8 @@
 package pkg
 
 import (
+	"encoding/json"
 	_ "encoding/json"
-	"fmt"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"log"
 	"main/configkub"
@@ -26,7 +26,7 @@ func GetServices(w http.ResponseWriter, r *http.Request)  {
 	if err != nil {
 		log.Fatal(err)
 	}
+	json.NewEncoder(w).Encode(services.Items)
 
-	fmt.Fprint(w, services.Items)
 
 }