update hook.yaml during init

Signed-off-by: mintcckey <[email protected]>

go.mod

@@ -42,3 +42,5 @@ require (
 	sigs.k8s.io/controller-runtime v0.9.6
 	sigs.k8s.io/yaml v1.2.0
 )
+
+replace github.com/milvus-io/milvus-operator => github.com/mintcckey/milvus-operator-new v0.8.3-r2

pkg/controllers/deployment_updater.go

@@ -27,6 +27,7 @@ type deploymentUpdater interface {
 	GetPersistenceConfig() *v1beta1.Persistence
 	GetMilvus() *v1beta1.Milvus
 	RollingUpdateImageDependencyReady() bool
+	HasHookConfig() bool
 }
 
 func updateDeployment(deployment *appsv1.Deployment, updater deploymentUpdater) error {
@@ -192,6 +193,9 @@ func updateMilvusContainer(template *corev1.PodTemplateSpec, updater deploymentU
 
 	addVolumeMount(&container.VolumeMounts, configVolumeMount)
 	addVolumeMount(&container.VolumeMounts, toolVolumeMount)
+	if updater.HasHookConfig() {
+		addVolumeMount(&container.VolumeMounts, hookConfigVolumeMount)
+	}
 	if persistence := updater.GetPersistenceConfig(); persistence != nil && persistence.Enabled {
 		addVolumeMount(&container.VolumeMounts, persistentVolumeMount(*persistence))
 	}
@@ -347,3 +351,7 @@ func (m milvusDeploymentUpdater) RollingUpdateImageDependencyReady() bool {
 	}
 	return true
 }
+
+func (m milvusDeploymentUpdater) HasHookConfig() bool {
+	return len(m.Milvus.Spec.HookConf.Data) > 0
+}

pkg/controllers/deployments.go

@@ -17,15 +17,16 @@ import (
 )
 
 const (
-	MilvusDataVolumeName         = "milvus-data" // for standalone persistence only
-	MilvusConfigVolumeName       = "milvus-config"
-	MilvusOriginalConfigPath     = "/milvus/configs/milvus.yaml"
-	MilvusUserConfigMountPath    = "/milvus/configs/user.yaml"
-	MilvusUserConfigMountSubPath = "user.yaml"
-	MilvusHookConfigMountSubPath = "hook.yaml"
-	AccessKey                    = "accesskey"
-	SecretKey                    = "secretkey"
-	AnnotationCheckSum           = "checksum/config"
+	MilvusDataVolumeName             = "milvus-data" // for standalone persistence only
+	MilvusConfigVolumeName           = "milvus-config"
+	MilvusOriginalConfigPath         = "/milvus/configs/milvus.yaml"
+	MilvusUserConfigMountPath        = "/milvus/configs/user.yaml"
+	MilvusHookConfigUpdatesMountPath = "/milvus/configs/hook_updates.yaml"
+	MilvusUserConfigMountSubPath     = "user.yaml"
+	MilvusHookConfigMountSubPath     = "hook.yaml"
+	AccessKey                        = "accesskey"
+	SecretKey                        = "secretkey"
+	AnnotationCheckSum               = "checksum/config"
 
 	ToolsVolumeName = "tools"
 	ToolsMountPath  = "/milvus/tools"
@@ -267,6 +268,13 @@ var (
 		MountPath: MilvusUserConfigMountPath,
 		SubPath:   MilvusUserConfigMountSubPath,
 	}
+
+	hookConfigVolumeMount = corev1.VolumeMount{
+		Name:      MilvusConfigVolumeName,
+		ReadOnly:  true,
+		MountPath: MilvusHookConfigUpdatesMountPath,
+		SubPath:   MilvusHookConfigMountSubPath,
+	}
 )
 
 func configVolumeByName(name string) corev1.Volume {

scripts/run.sh

@@ -2,7 +2,10 @@
 set -e
 MilvusUserConfigMountPath="/milvus/configs/user.yaml"
 MilvusOriginalConfigPath="/milvus/configs/milvus.yaml"
+MilvusHookConfigMountPath="/milvus/configs/hook.yaml"
+MilvusHookConfigUpdatesMountPath="/milvus/configs/hook_updates.yaml"
 # merge config
 /milvus/tools/merge -s ${MilvusUserConfigMountPath} -d ${MilvusOriginalConfigPath}
+/milvus/tools/merge -s ${MilvusHookConfigUpdatesMountPath} -d ${MilvusHookConfigMountPath}
 # run commands
 exec $@

tool/merge/main.go

@@ -17,6 +17,11 @@ var mqConfigsToDelete = map[string]bool{
 	"pulsar":  true,
 }
 
+func checkFileExists(filepath string) bool {
+	_, err := os.Stat(filepath)
+	return err == nil
+}
+
 func main() {
 	srcPath := flag.String("s", "", "source yaml path, will overwrite the dst config")
 	dstPath := flag.String("d", "", "destination yaml path, will be overwritten by the src config")
@@ -28,6 +33,15 @@ func main() {
 		return
 	}
 
+	if !checkFileExists(*srcPath) {
+		log.Println("missing source yaml")
+		os.Exit(0)
+	}
+	if !checkFileExists(*dstPath) {
+		log.Println("missing destination yaml")
+		os.Exit(0)
+	}
+
 	src, err := readYaml(*srcPath)
 	if err != nil {
 		log.Fatal("read source yaml failed: ", err)