wip

Author: ushitora-anqou

test/e2e/multik8s/misc_test.go

@@ -14,6 +14,39 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 )
 
+var _ = Describe("metrics tests", func() {
+	namespace := util.GetUniqueName("ns-")
+	pvcName := util.GetUniqueName("pvc-")
+	backupName := util.GetUniqueName("mb-")
+	backupConfigName := util.GetUniqueName("mbc-")
+
+	It("should setup", func(ctx SpecContext) {
+		SetupEnvironment(namespace)
+		CreatePVC(ctx, PrimaryK8sCluster, namespace, pvcName)
+		CreateMantleBackup(PrimaryK8sCluster, namespace, pvcName, backupName)
+		WaitMantleBackupSynced(namespace, backupName)
+		CreateMantleBackupConfig(PrimaryK8sCluster, namespace, pvcName, backupConfigName)
+	})
+
+	DescribeTable("metrics should be exposed",
+		func(ctx SpecContext, metricName string) {
+			Eventually(ctx, func(g Gomega) {
+				controllerPod, err := GetControllerPodName(PrimaryK8sCluster)
+				g.Expect(err).NotTo(HaveOccurred())
+				stdout, _, err := Kubectl(PrimaryK8sCluster, nil, "exec", "-n", CephClusterNamespace, controllerPod, "--",
+					"curl", "-s", "http://localhost:8080/metrics")
+				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(strings.Contains(string(stdout), metricName)).To(BeTrue())
+			}).Should(Succeed())
+		},
+		Entry(`mantle_backup_duration_seconds_total`, `mantle_backup_duration_seconds_total`),
+		Entry(`mantle_mantlebackupconfig_info`, `mantle_mantlebackupconfig_info`),
+		Entry(`mantle_backup_duration_seconds_bucket`, `mantle_backup_duration_seconds_bucket`),
+		Entry(`mantle_backup_duration_seconds_sum`, `mantle_backup_duration_seconds_sum`),
+		Entry(`mantle_backup_duration_seconds_count`, `mantle_backup_duration_seconds_count`),
+	)
+})
+
 var _ = Describe("miscellaneous tests", func() {
 	It("should succeed to back up if backup-transfer-part-size is changed during uploading", func(ctx SpecContext) {
 		namespace := util.GetUniqueName("ns-")
@@ -348,28 +381,4 @@ spec:
 			0, // reset an import Job to the original one to revive the Job.
 		),
 	)
-
-	It("should get metrics from the controller pod in the primary cluster", func(ctx SpecContext) {
-		metrics := []string{
-			`mantle_backup_duration_seconds_total`,
-			`mantle_mantlebackupconfig_info`,
-			`mantle_backup_duration_seconds_buckets`,
-			`mantle_backup_duration_seconds_sum`,
-			`mantle_backup_duration_seconds_count`,
-		}
-		ensureMetricsAreExposed(metrics)
-	})
 })
-
-func ensureMetricsAreExposed(metrics []string) {
-	GinkgoHelper()
-	controllerPod, err := GetControllerPodName(PrimaryK8sCluster)
-	Expect(err).NotTo(HaveOccurred())
-
-	stdout, _, err := Kubectl(PrimaryK8sCluster, nil, "exec", "-n", CephClusterNamespace, controllerPod, "--",
-		"curl", "-s", "http://localhost:8080/metrics")
-	Expect(err).NotTo(HaveOccurred())
-	for _, metric := range metrics {
-		Expect(strings.Contains(string(stdout), metric)).To(BeTrue())
-	}
-}

test/e2e/multik8s/testutil/testdata/mantlebackupconfig-template.yaml

@@ -0,0 +1,10 @@
+apiVersion: mantle.cybozu.io/v1
+kind: MantleBackupConfig
+metadata:
+  name: %s
+  namespace: %s
+spec:
+  pvc: %s
+  expire: "1d"
+  schedule: "00 00 * * *"
+  suspend: false

test/e2e/multik8s/testutil/util.go

@@ -46,6 +46,8 @@ var (
 	testRBDPoolSCTemplate string
 	//go:embed testdata/mantlebackup-template.yaml
 	testMantleBackupTemplate string
+	//go:embed testdata/mantlebackupconfig-template.yaml
+	testMantleBackupConfigTemplate string
 	//go:embed testdata/mantlerestore-template.yaml
 	testMantleRestoreTemplate string
 	//go:embed testdata/mount-deploy-template.yaml
@@ -137,6 +139,15 @@ func ApplyMantleBackupTemplate(clusterNo int, namespace, pvcName, backupName str
 	return nil
 }
 
+func ApplyMantleBackupConfigTemplate(clusterNo int, namespace, pvcName, backupConfigName string) error {
+	manifest := fmt.Sprintf(testMantleBackupConfigTemplate, backupConfigName, namespace, pvcName)
+	_, _, err := Kubectl(clusterNo, []byte(manifest), "apply", "-f", "-")
+	if err != nil {
+		return fmt.Errorf("kubectl apply mantlebackup failed. err: %w", err)
+	}
+	return nil
+}
+
 func ApplyMantleRestoreTemplate(clusterNo int, namespace, restoreName, backupName string) error {
 	manifest := fmt.Sprintf(testMantleRestoreTemplate, restoreName, restoreName, namespace, backupName)
 	_, _, err := Kubectl(clusterNo, []byte(manifest), "apply", "-f", "-")
@@ -487,6 +498,14 @@ func CreateMantleBackup(cluster int, namespace, pvcName, backupName string) {
 	}).Should(Succeed())
 }
 
+func CreateMantleBackupConfig(cluster int, namespace, pvcName, backupConfigName string) {
+	GinkgoHelper()
+	By("creating a MantleBackupConfig object")
+	Eventually(func() error {
+		return ApplyMantleBackupConfigTemplate(cluster, namespace, pvcName, backupConfigName)
+	}).Should(Succeed())
+}
+
 func WaitMantleBackupReadyToUse(cluster int, namespace, backupName string) {
 	GinkgoHelper()
 	By("checking MantleBackup's ReadyToUse status")