*: v3.0.0 backup convert do not work when use helm install it. radond…

…b#793
acekingke · Jun 7, 2023 · 737a3be · 737a3be
1 parent 174b801
commit 737a3be
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -57,8 +57,9 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 update-crd:	## Synchronize the generated YAML files to operator Chart after make manifests.
-	make manifests
-	cp config/crd/bases/* charts/mysql-operator/crds/
+##make manifests
+	@echo "should modify by manaual for mysqlclster and mysqlbackup"
+	cp config/crd/bases/mysql.radondb.com_mysqlusers.yaml charts/mysql-operator/crds/
 
 generate: controller-gen generate-go-conversions ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."

diff --git a/PROJECT b/PROJECT
@@ -60,4 +60,7 @@ resources:
   kind: Backup
   path: github.com/radondb/radondb-mysql-kubernetes/api/v1beta1
   version: v1beta1
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 version: "3"
diff --git a/api/v1beta1/mysqlcluster_conversion.go b/api/v1beta1/mysqlcluster_conversion.go
@@ -19,11 +19,13 @@ package v1beta1
 import (
 	"fmt"
 	"strings"
+	"time"
 	"unsafe"
 
 	"github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
@@ -183,13 +185,58 @@ func Convert_v1beta1_BackupStatus_To_v1alpha1_BackupStatus(in *BackupStatus, out
 	if err := autoConvert_v1beta1_BackupStatus_To_v1alpha1_BackupStatus(in, out, s); err != nil {
 		return err
 	}
+	out.BackupDate = in.CompletionTime.Format("2006-01-02 15:04:05")
+	switch in.State {
+	case BackupFailed:
+		out.Conditions = append(out.Conditions, v1alpha1.BackupCondition{
+			Type:   v1alpha1.BackupStart,
+			Status: corev1.ConditionTrue,
+			Reason: "",
+		}, v1alpha1.BackupCondition{
+			Type:   v1alpha1.BackupFailed,
+			Status: corev1.ConditionTrue,
+			Reason: "",
+		})
+		out.Completed = true
+	case BackupSucceeded:
+		out.Conditions = append(out.Conditions, v1alpha1.BackupCondition{
+			Type:   v1alpha1.BackupStart,
+			Status: corev1.ConditionTrue,
+			Reason: "",
+		}, v1alpha1.BackupCondition{
+			Type:   v1alpha1.BackupComplete,
+			Status: corev1.ConditionTrue,
+			Reason: "",
+		})
+		out.Completed = true
+	}
 	return nil
 }
 
 func Convert_v1alpha1_BackupStatus_To_v1beta1_BackupStatus(in *v1alpha1.BackupStatus, out *BackupStatus, s apiconversion.Scope) error {
 	if err := autoConvert_v1alpha1_BackupStatus_To_v1beta1_BackupStatus(in, out, s); err != nil {
 		return err
 	}
+	if t, err := time.Parse("2006-01-02 15:04:05", in.BackupDate); err != nil {
+		return err
+	} else {
+		completeTime := metav1.NewTime(t)
+		out.CompletionTime = &completeTime
+	}
+	if in.Completed {
+		out.State = BackupFailed
+		for _, cond := range in.Conditions {
+
+			if cond.Type == v1alpha1.BackupStart && cond.Status == corev1.ConditionTrue &&
+				out.State != BackupSucceeded {
+				out.State = BackupStart
+			}
+			if cond.Type == v1alpha1.BackupComplete && cond.Status == corev1.ConditionTrue {
+				out.State = BackupSucceeded
+				break
+			}
+		}
+	}
 	return nil
 }
 

diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/charts/mysql-operator/templates/NOTES.txt b/charts/mysql-operator/templates/NOTES.txt
@@ -8,11 +8,11 @@ Create MySQLCluster:
 > Create MySQLCluster:
 {{- end }}
 
-kubectl apply -f https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1alpha1_mysqlcluster.yaml
+kubectl apply -f https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1beta1_mysqlcluster.yaml
 
 Create Users:
 
-kubectl apply -f https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1alpha1_mysqluser.yaml
+kubectl apply -f https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1beta1_mysqluser.yaml
 
 {{- if .Values.mysqlcluster.install }}
 

diff --git a/...rator/crds/mysql.radondb.com_backups.yaml → .../templates/mysql.radondb.com_backups.yaml b/...rator/crds/mysql.radondb.com_backups.yaml → .../templates/mysql.radondb.com_backups.yaml
@@ -1,13 +1,31 @@
-
----
+{{- $certManagerEnabled := .Values.webhook.certManager.enabled -}}
+{{- $caCertPEM := include "webhook.caBundleCertPEM" . -}}
+{{- $tlsCertPEM := include "webhook.certPEM" . -}}
+{{- $tlsKeyPEM := include "webhook.keyPEM" . -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+  {{- if $certManagerEnabled }}
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ template "certificate.name" . }}"
+  {{- end }}
   creationTimestamp: null
   name: backups.mysql.radondb.com
 spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+      {{- if not $certManagerEnabled }}
+        caBundle: {{ ternary (b64enc $caCertPEM) (b64enc (trim $tlsCertPEM)) (empty $tlsKeyPEM) }}
+      {{- end }}
+        service:
+          name: radondb-mysql-webhook
+          namespace: default
+          path: /convert
+      conversionReviewVersions:
+      - v1
   group: mysql.radondb.com
   names:
     kind: Backup

diff --git a/...crds/mysql.radondb.com_mysqlclusters.yaml → ...ates/mysql.radondb.com_mysqlclusters.yaml b/...crds/mysql.radondb.com_mysqlclusters.yaml → ...ates/mysql.radondb.com_mysqlclusters.yaml
@@ -1,19 +1,25 @@
-
----
+{{- $certManagerEnabled := .Values.webhook.certManager.enabled  -}}
+{{- $caCertPEM := include "webhook.caBundleCertPEM" .  -}}
+{{- $tlsCertPEM := include "webhook.certPEM" .  -}}
+{{- $tlsKeyPEM := include "webhook.keyPEM" .  -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
-    cert-manager.io/inject-ca-from: default/radondb-mysql-certificate
+{{- if $certManagerEnabled }}
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ template "certificate.name" . }}"
+{{- end }}
   creationTimestamp: null
   name: mysqlclusters.mysql.radondb.com
 spec:
   conversion:
     strategy: Webhook
     webhook:
       clientConfig:
-        caBundle: Cg==
+      {{- if not $certManagerEnabled }}
+        caBundle: {{ ternary (b64enc $caCertPEM) (b64enc (trim $tlsCertPEM)) (empty $tlsKeyPEM) }}
+      {{- end }}
         service:
           name: radondb-mysql-webhook
           namespace: default

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -12,7 +12,7 @@ patchesStrategicMerge:
 # patches here are for enabling the conversion webhook for each CRD
 - patches/webhook_in_mysqlclusters.yaml
 #- patches/webhook_in_mysqlclusters.yaml
-#- patches/webhook_in_backups.yaml
+- patches/webhook_in_backups.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.

diff --git a/config/crd/patches/webhook_in_backups.yaml b/config/crd/patches/webhook_in_backups.yaml
@@ -0,0 +1,16 @@
+# The following patch enables a conversion webhook for the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: backups.mysql.radondb.com
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          namespace: system
+          name: radondb-mysql-webhook
+          path: /convert
+      conversionReviewVersions:
+      - v1