Add persistentVolumeClaimRetentionPolicy field (#633)

* Add persistentVolumeClaimRetentionPolicy field * Add if
streamnative · May 8, 2023 · 8f16303 · 8f16303
1 parent 5dfa387
commit 8f16303
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 7 deletions.
diff --git a/api/compute/v1alpha1/function_types.go b/api/compute/v1alpha1/function_types.go
@@ -18,6 +18,7 @@
 package v1alpha1
 
 import (
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -101,6 +102,9 @@ type FunctionSpec struct {
 
 	// +kubebuilder:validation:Optional
 	VolumeClaimTemplates []corev1.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	PersistentVolumeClaimRetentionPolicy *appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy `json:"persistentVolumeClaimRetentionPolicy,omitempty"`
 }
 
 // FunctionStatus defines the observed state of Function

diff --git a/api/compute/v1alpha1/zz_generated.deepcopy.go b/api/compute/v1alpha1/zz_generated.deepcopy.go
diff --git a/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml b/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml
@@ -295,6 +295,13 @@ spec:
                           typeClassName:
                             type: string
                         type: object
+                      persistentVolumeClaimRetentionPolicy:
+                        properties:
+                          whenDeleted:
+                            type: string
+                          whenScaled:
+                            type: string
+                        type: object
                       pod:
                         properties:
                           affinity:

diff --git a/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml b/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml
@@ -314,6 +314,13 @@ spec:
                     typeClassName:
                       type: string
                   type: object
+                persistentVolumeClaimRetentionPolicy:
+                  properties:
+                    whenDeleted:
+                      type: string
+                    whenScaled:
+                      type: string
+                  type: object
                 pod:
                   properties:
                     affinity:

diff --git a/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml b/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml
@@ -296,6 +296,13 @@ spec:
                         typeClassName:
                           type: string
                       type: object
+                    persistentVolumeClaimRetentionPolicy:
+                      properties:
+                        whenDeleted:
+                          type: string
+                        whenScaled:
+                          type: string
+                      type: object
                     pod:
                       properties:
                         affinity:

diff --git a/config/crd/bases/compute.functionmesh.io_functions.yaml b/config/crd/bases/compute.functionmesh.io_functions.yaml
@@ -293,6 +293,13 @@ spec:
                   typeClassName:
                     type: string
                 type: object
+              persistentVolumeClaimRetentionPolicy:
+                properties:
+                  whenDeleted:
+                    type: string
+                  whenScaled:
+                    type: string
+                type: object
               pod:
                 properties:
                   affinity:

diff --git a/controllers/spec/common.go b/controllers/spec/common.go
@@ -260,7 +260,8 @@ func MakeStatefulSet(objectMeta *metav1.ObjectMeta, replicas *int32, downloaderI
 	volumes []corev1.Volume, labels map[string]string, policy v1alpha1.PodPolicy, pulsar v1alpha1.PulsarMessaging,
 	javaRuntime *v1alpha1.JavaRuntime, pythonRuntime *v1alpha1.PythonRuntime,
 	goRuntime *v1alpha1.GoRuntime, definedVolumeMounts []corev1.VolumeMount,
-	volumeClaimTemplates []corev1.PersistentVolumeClaim) *appsv1.StatefulSet {
+	volumeClaimTemplates []corev1.PersistentVolumeClaim,
+	persistentVolumeClaimRetentionPolicy *appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy) *appsv1.StatefulSet {
 
 	volumeMounts := generateDownloaderVolumeMountsForDownloader(javaRuntime, pythonRuntime, goRuntime)
 	var downloaderContainer *corev1.Container
@@ -323,13 +324,15 @@ func MakeStatefulSet(objectMeta *metav1.ObjectMeta, replicas *int32, downloaderI
 		},
 		ObjectMeta: *objectMeta,
 		Spec: *MakeStatefulSetSpec(replicas, container, podVolumes, labels, policy,
-			MakeHeadlessServiceName(objectMeta.Name), downloaderContainer, volumeClaimTemplates),
+			MakeHeadlessServiceName(objectMeta.Name), downloaderContainer, volumeClaimTemplates,
+			persistentVolumeClaimRetentionPolicy),
 	}
 }
 
 func MakeStatefulSetSpec(replicas *int32, container *corev1.Container,
 	volumes []corev1.Volume, labels map[string]string, policy v1alpha1.PodPolicy,
-	serviceName string, downloaderContainer *corev1.Container, volumeClaimTemplates []corev1.PersistentVolumeClaim) *appsv1.StatefulSetSpec {
+	serviceName string, downloaderContainer *corev1.Container, volumeClaimTemplates []corev1.PersistentVolumeClaim,
+	persistentVolumeClaimRetentionPolicy *appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy) *appsv1.StatefulSetSpec {
 	spec := &appsv1.StatefulSetSpec{
 		Replicas: replicas,
 		Selector: &metav1.LabelSelector{
@@ -345,6 +348,9 @@ func MakeStatefulSetSpec(replicas *int32, container *corev1.Container,
 	if len(volumeClaimTemplates) > 0 {
 		spec.VolumeClaimTemplates = volumeClaimTemplates
 	}
+	if persistentVolumeClaimRetentionPolicy != nil {
+		spec.PersistentVolumeClaimRetentionPolicy = persistentVolumeClaimRetentionPolicy
+	}
 	return spec
 }
 

diff --git a/controllers/spec/function.go b/controllers/spec/function.go
@@ -60,7 +60,7 @@ func MakeFunctionStatefulSet(function *v1alpha1.Function) *appsv1.StatefulSet {
 	return MakeStatefulSet(objectMeta, function.Spec.Replicas, function.Spec.DownloaderImage,
 		makeFunctionContainer(function), makeFunctionVolumes(function, function.Spec.Pulsar.AuthConfig), makeFunctionLabels(function), function.Spec.Pod,
 		*function.Spec.Pulsar, function.Spec.Java, function.Spec.Python, function.Spec.Golang,
-		function.Spec.VolumeMounts, function.Spec.VolumeClaimTemplates)
+		function.Spec.VolumeMounts, function.Spec.VolumeClaimTemplates, function.Spec.PersistentVolumeClaimRetentionPolicy)
 }
 
 func MakeFunctionObjectMeta(function *v1alpha1.Function) *metav1.ObjectMeta {

diff --git a/controllers/spec/sink.go b/controllers/spec/sink.go
@@ -55,7 +55,7 @@ func MakeSinkStatefulSet(sink *v1alpha1.Sink) *appsv1.StatefulSet {
 	objectMeta := MakeSinkObjectMeta(sink)
 	return MakeStatefulSet(objectMeta, sink.Spec.Replicas, sink.Spec.DownloaderImage, makeSinkContainer(sink),
 		makeSinkVolumes(sink, sink.Spec.Pulsar.AuthConfig), makeSinkLabels(sink), sink.Spec.Pod, *sink.Spec.Pulsar,
-		sink.Spec.Java, sink.Spec.Python, sink.Spec.Golang, sink.Spec.VolumeMounts, nil)
+		sink.Spec.Java, sink.Spec.Python, sink.Spec.Golang, sink.Spec.VolumeMounts, nil, nil)
 }
 
 func MakeSinkServiceName(sink *v1alpha1.Sink) string {

diff --git a/controllers/spec/source.go b/controllers/spec/source.go
@@ -57,7 +57,7 @@ func MakeSourceStatefulSet(source *v1alpha1.Source) *appsv1.StatefulSet {
 	objectMeta := MakeSourceObjectMeta(source)
 	return MakeStatefulSet(objectMeta, source.Spec.Replicas, source.Spec.DownloaderImage, makeSourceContainer(source),
 		makeSourceVolumes(source, source.Spec.Pulsar.AuthConfig), makeSourceLabels(source), source.Spec.Pod, *source.Spec.Pulsar,
-		source.Spec.Java, source.Spec.Python, source.Spec.Golang, source.Spec.VolumeMounts, nil)
+		source.Spec.Java, source.Spec.Python, source.Spec.Golang, source.Spec.VolumeMounts, nil, nil)
 }
 
 func MakeSourceObjectMeta(source *v1alpha1.Source) *metav1.ObjectMeta {

diff --git a/hack/gen-helm-crd-templates.sh b/hack/gen-helm-crd-templates.sh
@@ -68,7 +68,7 @@ function crd::convert_webhook() {
     echo "clientConfig:" | sed  "s/^/$(crd::nindent 1)/"
     # webhook.clientConfig.caBundle
     echo "{{- if eq .Values.admissionWebhook.certificate.provider \"custom\" }}" | sed  "s/^/$(crd::nindent 2)/"
-    echo "{{- \$caSecret := (lookup \"v1\" \"Secret\" \"default\" (include \"function-mesh-operator.certificate.caSecret\" .)) -}}" | sed  "s/^/$(crd::nindent 3)/"
+    echo "{{- \$caSecret := (lookup \"v1\" \"Secret\" .Values.admissionWebhook.secretsWebhookNamespace (include \"function-mesh-operator.certificate.caSecret\" .)) -}}" | sed  "s/^/$(crd::nindent 3)/"
     echo "{{- if \$caSecret }}" | sed  "s/^/$(crd::nindent 3)/"
     echo "{{- \$caCert := (b64dec (get \$caSecret.data \"tls.crt\")) -}}" | sed  "s/^/$(crd::nindent 4)/"
     echo "{{ printf (include \"function-mesh-operator.caBundle\" .) (b64enc \$caCert) | nindent 8 }}" | sed  "s/^/$(crd::nindent 4)/"