diff --git a/go.mod b/go.mod index c36b671..aac74c7 100644 --- a/go.mod +++ b/go.mod @@ -20,12 +20,16 @@ require ( k8s.io/client-go v0.26.1 ) +require ( + github.com/goccy/go-json v0.10.0 + github.com/thoas/go-funk v0.9.3 +) + require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.11.2 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect - github.com/goccy/go-json v0.10.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect @@ -35,7 +39,6 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-isatty v0.0.17 // indirect @@ -43,7 +46,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/thoas/go-funk v0.9.3 // indirect github.com/ugorji/go/codec v1.2.9 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/net v0.6.0 // indirect diff --git a/go.sum b/go.sum index 8c48603..7f17669 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,7 @@ github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXym github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -156,8 +157,10 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= @@ -175,13 +178,18 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= +github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -193,6 +201,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= @@ -468,6 +477,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= diff --git a/src/app_model.go b/src/app_model.go index 3b7cb4d..d58d6aa 100644 --- a/src/app_model.go +++ b/src/app_model.go @@ -68,6 +68,10 @@ func (a *AppModel) ServiceName() string { if strings.TrimSpace(a.SvcName) != "" { return a.SvcName } + return a.DefaultServiceName() +} + +func (a *AppModel) DefaultServiceName() string { return fmt.Sprintf("%s-service", a.NamePrefix()) } diff --git a/src/app_viewmodel.go b/src/app_viewmodel.go index 6d3d172..be09714 100644 --- a/src/app_viewmodel.go +++ b/src/app_viewmodel.go @@ -40,7 +40,7 @@ func AppPage(c *gin.Context) { appsvm := funk.Map(GetApps(username), func(a AppModel) AppViewModel { return AppViewModel{AppModel: &a} }).([]AppViewModel) for i := range appsvm { a := &appsvm[i] - d, e := K.GetAppStatus(a.AppModel) + d, e := K.GetDeploymentStatus(a.AppModel.DeploymentName()) a.Status = statusString(d, e) } vm := &AppsViewModel{ diff --git a/src/k8s_client.go b/src/k8s_client.go index be58359..66b30ff 100644 --- a/src/k8s_client.go +++ b/src/k8s_client.go @@ -3,13 +3,15 @@ package k8s_manager import ( "context" "fmt" - "github.com/goccy/go-json" log "github.com/sirupsen/logrus" appv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/selection" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "strings" ) type K8sClient struct { @@ -41,13 +43,24 @@ func (c *K8sClient) ListPods() { } } -func (c *K8sClient) GetAppStatus(app *AppModel) (*appv1.DeploymentStatus, error) { - get, err := c.AppsV1().Deployments(c.Namespace).Get(context.Background(), app.DeploymentName(), metav1.GetOptions{}) +func (c *K8sClient) GetDeploymentStatus(deploymentName string) (*appv1.DeploymentStatus, error) { + get, err := c.AppsV1().Deployments(c.Namespace).Get(context.Background(), deploymentName, metav1.GetOptions{}) // log.WithError(err).WithField("dep", get).WithField("name", app.DeploymentName()).Info("GetAppStatus") return &get.Status, err } -func (c *K8sClient) CreateApp(app *AppModel) { +func (c *K8sClient) DeploymentExists(deploymentName string) bool { + _, e := c.GetDeploymentStatus(deploymentName) + if e == nil { + return true + } + if !strings.Contains(e.Error(), "not found") { + log.WithError(e).Error("DeploymentExists") + } + return false +} + +func (c *K8sClient) UpdateDeployment(app *AppModel) { var rep int32 = 1 labelKey, labelValue := app.GetLabel() labels := map[string]string{labelKey: labelValue} @@ -77,13 +90,33 @@ func (c *K8sClient) CreateApp(app *AppModel) { }, }, } - deployment, err := c.AppsV1().Deployments(c.Namespace).Create(context.Background(), deployment, metav1.CreateOptions{}) - if err != nil { - d, _ := json.Marshal(deployment) - fmt.Println(string(d)) - log.WithError(err).Error("Create Deployment error.") + var err error + if c.DeploymentExists(app.DeploymentName()) { + deployment, err = c.AppsV1().Deployments(c.Namespace).Update(context.Background(), deployment, metav1.UpdateOptions{}) + } else { + deployment, err = c.AppsV1().Deployments(c.Namespace).Create(context.Background(), deployment, metav1.CreateOptions{}) } + if err != nil { + //d, _ := json.Marshal(deployment) + //fmt.Println(string(d)) + log.WithError(err).Error("Update Deployment error.") + } +} +func (c *K8sClient) ServiceExists(servername string) bool { + _, err := c.CoreV1().Services(c.Namespace).Get(context.Background(), servername, metav1.GetOptions{}) + if err == nil { + return true + } + if !strings.Contains(err.Error(), "not found") { + log.WithError(err).Error("ServiceExists") + } + return false +} + +func (c *K8sClient) UpdateService(app *AppModel) { + labelKey, labelValue := app.GetLabel() + labels := map[string]string{labelKey: labelValue} service := &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: app.ServiceName(), @@ -94,17 +127,64 @@ func (c *K8sClient) CreateApp(app *AppModel) { Selector: labels, }, } - - service, err = c.CoreV1().Services(c.Namespace).Create(context.Background(), service, metav1.CreateOptions{}) - if err != nil { - log.WithError(err).Error("Create Service ") + if app.ServiceName() != app.DefaultServiceName() { + if c.ServiceExists(app.DefaultServiceName()) { + err := c.CoreV1().Services(c.Namespace).Delete(context.Background(), app.DefaultServiceName(), metav1.DeleteOptions{}) + if err != nil { + log.WithError(err).Error("UpdateService Delete error") + } + } } + var err error + if c.ServiceExists(app.ServiceName()) { + _, err = c.CoreV1().Services(c.Namespace).Update(context.Background(), service, metav1.UpdateOptions{}) + } else { + _, err = c.CoreV1().Services(c.Namespace).Create(context.Background(), service, metav1.CreateOptions{}) + } + if err != nil { + log.WithError(err).Error("UpdateService") + } + +} + +func (c *K8sClient) CreateApp(app *AppModel) { + c.UpdateDeployment(app) + c.UpdateService(app) } func (c *K8sClient) DeleteApp(app *AppModel) { - err := c.AppsV1().Deployments(c.Namespace).Delete(context.Background(), app.DeploymentName(), metav1.DeleteOptions{}) - if err != nil { - log.WithError(err).Error("Delete error ", app.DeploymentName()) - return + c.DeleteDeployment(app.DeploymentName()) + c.DeleteService(app.ServiceName()) + if app.ServiceName() != app.DefaultServiceName() { + c.DeleteService(app.DefaultServiceName()) } } + +func (c *K8sClient) DeleteDeployment(depName string) { + if !c.DeploymentExists(depName) { + return + } + err := c.AppsV1().Deployments(c.Namespace).Delete(context.Background(), depName, metav1.DeleteOptions{}) + if err != nil { + log.WithError(err).Error("Delete Deployment") + } +} + +func (c *K8sClient) DeleteService(svcName string) { + if !c.ServiceExists(svcName) { + return + } + err := c.CoreV1().Services(c.Namespace).Delete(context.Background(), svcName, metav1.DeleteOptions{}) + if err != nil { + log.WithError(err).Error("Delete Service") + } +} + +func (c *K8sClient) GetAllServices() *v1.ServiceList { + req, _ := labels.NewRequirement("cg-label", selection.Exists, []string{}) + list, err := c.CoreV1().Services(c.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: req.String()}) + if err != nil { + log.WithError(err).Error("GetAllServices") + } + return list +}