diff --git a/Makefile b/Makefile index 1b2efb9..67e535f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -IMAGE_TAG ?= docker.educg.net/k8s/manager:dev +IMAGE_TAG ?= docker.educg.net/cg/k8s-manager:v1.0.1 build: export CGO_ENABLED=0 build: export GOOS=linux @@ -18,3 +18,6 @@ uninstall: restart: docker kubectl delete -f install.yaml kubectl apply -f install.yaml + +push: docker + docker push $(IMAGE_TAG) \ No newline at end of file diff --git a/README.md b/README.md index 19e4a8f..e0876dd 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ kubectl get secret dev-secret -o yaml ```bash helm repo add traefik https://traefik.github.io/charts helm repo update -helm install traefik traefik/traefik -helm uninstall traefik traefik/traefik +helm install -f traefik-conf.yaml traefik traefik/traefik +helm uninstall traefik helm install traefik traefik/traefik --set expose.dashboard=true ``` \ No newline at end of file diff --git a/main.go b/main.go index 6d3187e..59fb4ad 100644 --- a/main.go +++ b/main.go @@ -17,21 +17,12 @@ func main() { r := gin.Default() - //r.SetFuncMap(template.FuncMap{ - // "inc": m.Inc, - //}) - // - //tmp := template.Must(template.New(""). - // Funcs(template.FuncMap{ - // "inc": m.Inc, - // }). - // ParseFS(f, "template/*")) - // - //r.SetHTMLTemplate(tmp) fp, _ := fs.Sub(f, "static") r.StaticFS("/static", http.FS(fp)) - r.GET("/index", m.JWTAuthMiddleware, m.AppPage) + r.GET("/index", m.JWTAuthMiddleware, func(c *gin.Context) { + c.FileFromFS("/template/app_view.html", http.FS(f)) + }) r.GET("/apps", m.JWTAuthMiddleware, m.GetAppsController) r.POST("/app", m.JWTAuthMiddleware, m.CreateUpdateDeleteApp) r.PUT("/app", m.JWTAuthMiddleware, m.CreateUpdateDeleteApp) diff --git a/src/app_viewmodel.go b/src/app_viewmodel.go index e612a34..4e4350c 100644 --- a/src/app_viewmodel.go +++ b/src/app_viewmodel.go @@ -49,20 +49,7 @@ func statusString(a *AppViewModel) string { } func AppPage(c *gin.Context) { - //username := c.MustGet("username").(string) - //appsvm := funk.Map(GetApps(username), func(a AppModel) AppViewModel { return AppViewModel{AppModel: &a} }).([]AppViewModel) - //for i := range appsvm { - // a := &appsvm[i] - // a.Status = statusString(a) - // a.ServiceDisplayName = a.ServiceName() - //} - //vm := &AppsViewModel{ - // Username: username, - // Apps: appsvm, - //} - c.File("template/app_view.html") - // c.HTML(http.StatusOK, "app_view.html", vm) } func AppMiddleware(c *gin.Context) {