Bug 1821666: thanos ruler secret cleanup

Fix cleanup of thanos rule grpc tls secret.
openshift · Apr 23, 2020 · f7f7ca6 · f7f7ca6
1 parent 366dd8d
commit f7f7ca6
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/pkg/tasks/thanos_ruler_user_workload.go b/pkg/tasks/thanos_ruler_user_workload.go
@@ -393,9 +393,28 @@ func (t *ThanosRulerUserWorkloadTask) destroy() error {
 		return errors.Wrap(err, "initializing UserWorkload Thanos Ruler GRPC secret failed")
 	}
 
-	err = t.client.DeleteSecret(grpcTLS)
+	grpcTLS, err = t.client.WaitForSecret(grpcTLS)
 	if err != nil {
-		return errors.Wrap(err, "deleting Thanos Ruler GRPC secret failed")
+		return errors.Wrap(err, "waiting for UserWorkload Thanos Ruler GRPC secret failed")
+	}
+
+	s, err = t.factory.ThanosRulerGrpcTLSSecret()
+	if err != nil {
+		return errors.Wrap(err, "error initializing UserWorkload Thanos Ruler GRPC TLS secret")
+	}
+
+	s, err = t.factory.HashSecret(s,
+		"ca.crt", string(grpcTLS.Data["ca.crt"]),
+		"server.crt", string(grpcTLS.Data["prometheus-server.crt"]),
+		"server.key", string(grpcTLS.Data["prometheus-server.key"]),
+	)
+	if err != nil {
+		return errors.Wrap(err, "error hashing UserWorkload Thanos Ruler GRPC TLS secret")
+	}
+
+	err = t.client.DeleteSecret(s)
+	if err != nil {
+		return errors.Wrap(err, "error deleting UserWorkload Thanos Ruler GRPC TLS secret")
 	}
 
 	acs, err := t.factory.ThanosRulerAlertmanagerConfigSecret()