diff --git a/install.yaml b/install.yaml index 472ced3..574a25d 100644 --- a/install.yaml +++ b/install.yaml @@ -33,6 +33,10 @@ spec: value: "!bd832W0@CG" - name: ASE_KEY value: A5es$&!0GeoEast + - name: NFS_HOST + value: 192.168.252.250 + - name: NFS_PATH + value: /mnt/CGdata/ms --- apiVersion: v1 kind: Service diff --git a/src/app_model.go b/src/app_model.go index a1ed78b..0fd0bcd 100644 --- a/src/app_model.go +++ b/src/app_model.go @@ -8,15 +8,16 @@ import ( ) type AppModel struct { - Id int - AppName string - UserName string - Image string - Command string - Comment string - Env string - SvcName string - Ports string + Id int + AppName string + UserName string + Image string + Command string + Comment string + Env string + SvcName string + Ports string + PersistentPath string } func (*AppModel) TableName() string { @@ -36,21 +37,25 @@ func (a *AppModel) Fill() error { return res.Error } -func (a *AppModel) Update() error { +func (a *AppModel) fillDefaults() { if a.SvcName == "" { a.SvcName = "svc" } a.SvcName = strings.TrimPrefix(a.SvcName, a.NamePrefix()+"-") + if a.PersistentPath == "" { + a.PersistentPath = "/data/" + } +} + +func (a *AppModel) Update() error { + a.fillDefaults() db := DB() db.Save(a) return nil } func (a *AppModel) Create() error { - if a.SvcName == "" { - a.SvcName = "svc" - } - a.SvcName = strings.TrimPrefix(a.SvcName, a.NamePrefix()+"-") + a.fillDefaults() db := DB() db.Create(a) return nil @@ -155,7 +160,7 @@ func (a *AppModel) PersistentVolumeName() string { } func (a *AppModel) NFSPath() string { - return "/data/" + a.UserName + return GetConfig().NFSPath + "/" + a.UserName } func (a *AppModel) PersistentVolumeClaimName() string { @@ -165,3 +170,7 @@ func (a *AppModel) PersistentVolumeClaimName() string { func (a *AppModel) StorageClassName() string { return a.NamePrefix() + "-storage-class" } + +func (a *AppModel) PersistentVolumeMountName() string { + return a.NamePrefix() + "-pvm" +} diff --git a/src/config.go b/src/config.go index bf5fff4..2ec2909 100644 --- a/src/config.go +++ b/src/config.go @@ -40,7 +40,7 @@ func InitConfig() { config.NFSHost = os.Getenv("NFS_HOST") config.NFSPath = os.Getenv("NFS_PATH") - mustFields := []string{"JwtKey", "AseKey", "DBHost", "DBUser", "DBPassword"} + mustFields := []string{"JwtKey", "AseKey", "DBHost", "DBUser", "DBPassword", "NFSHost", "NFSPath"} optionalFields := map[string]string{} for _, f := range mustFields { if getField(config, f) == "" { diff --git a/src/k8s_client.go b/src/k8s_client.go index 763d284..ab38b7b 100644 --- a/src/k8s_client.go +++ b/src/k8s_client.go @@ -72,20 +72,24 @@ func (c *K8sClient) DeploymentExists(deploymentName string) bool { } func (c *K8sClient) UpdateDeployment(app *AppModel) { - var rep int32 = 1 labelKey, labelValue := app.GetLabel() l := map[string]string{labelKey: labelValue} podLabels := map[string]string{ labelKey: labelValue, "cg-deployment": app.DeploymentName(), } + containerPorts := funk.Map(app.GetPorts(), func(port int32) v1.ContainerPort { + return v1.ContainerPort{ + ContainerPort: port, + } + }).([]v1.ContainerPort) deployment := &appv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: app.DeploymentName(), Labels: l, }, Spec: appv1.DeploymentSpec{ - Replicas: &rep, + Replicas: UnnamedPointer(int32(1)), Selector: &metav1.LabelSelector{ MatchLabels: l, }, @@ -102,14 +106,30 @@ func (c *K8sClient) UpdateDeployment(app *AppModel) { Name: "URL_PREFIX", Value: app.ServiceName(), }), - VolumeMounts: nil, - Ports: []v1.ContainerPort{ - {ContainerPort: 80}, + VolumeMounts: []v1.VolumeMount{ + { + Name: app.PersistentVolumeMountName(), + ReadOnly: false, + MountPath: app.PersistentPath, + }, }, + Ports: containerPorts, SecurityContext: &v1.SecurityContext{ RunAsUser: UnnamedPointer(int64(0)), }, }}, + Volumes: []v1.Volume{ + { + Name: app.PersistentVolumeMountName(), + VolumeSource: v1.VolumeSource{ + NFS: &v1.NFSVolumeSource{ + Server: config.NFSHost, + Path: app.NFSPath(), + ReadOnly: false, + }, + }, + }, + }, }, }, }, @@ -362,7 +382,7 @@ func (c *K8sClient) CreatePersistentVolume(app *AppModel) { StorageClassName: app.StorageClassName(), PersistentVolumeSource: v1.PersistentVolumeSource{ NFS: &v1.NFSVolumeSource{ - Server: "192.168.252.250", + Server: GetConfig().NFSHost, Path: app.NFSPath(), ReadOnly: false, }, diff --git a/template/app_view.html b/template/app_view.html index 1f0ef2e..fa10ba3 100644 --- a/template/app_view.html +++ b/template/app_view.html @@ -115,6 +115,12 @@ placeholder="端口号"/> +
+ + +
+