Generate Query resources for production (#782)

Author: philipgough

magefiles/cr.go

@@ -18,6 +18,47 @@ import (
 	"k8s.io/utils/ptr"
 )
 
+// OperatorCR Generates the RHOBS-specific CRs for Thanos Operator.
+func (p Production) OperatorCR() {
+	templateDir := "rhobs-thanos-operator"
+
+	gen := p.generator(templateDir)
+	ns := p.namespace()
+	var objs []runtime.Object
+
+	objs = append(objs, queryCR(ns, ProductionMaps, true)...)
+	objs = append(objs, storeCR(ns, ProductionMaps)...)
+
+	// Sort objects by Kind then Name
+	sort.Slice(objs, func(i, j int) bool {
+		iMeta := objs[i].(metav1.Object)
+		jMeta := objs[j].(metav1.Object)
+		iType := objs[i].GetObjectKind().GroupVersionKind().Kind
+		jType := objs[j].GetObjectKind().GroupVersionKind().Kind
+
+		if iType != jType {
+			return iType < jType
+		}
+		return iMeta.GetName() < jMeta.GetName()
+	})
+
+	gen.Add("rhobs.yaml", encoding.GhodssYAML(
+		openshift.WrapInTemplate(
+			objs,
+			metav1.ObjectMeta{Name: "thanos-rhobs"},
+			[]templatev1.Parameter{
+				{
+					Name:     "OAUTH_PROXY_COOKIE_SECRET",
+					Generate: "expression",
+					From:     `[a-zA-Z0-9]{40}`,
+				},
+			},
+		),
+	))
+
+	gen.Generate()
+}
+
 // OperatorCR Generates the RHOBS-specific CRs for Thanos Operator.
 func (s Stage) OperatorCR() {
 	templateDir := "rhobs-thanos-operator"

magefiles/secrets.go

@@ -3,20 +3,31 @@ package main
 import (
 	"github.com/observatorium/observatorium/configuration_go/kubegen/openshift"
 	templatev1 "github.com/openshift/api/template/v1"
+	"github.com/philipgough/mimic"
 	"github.com/philipgough/mimic/encoding"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-// Secrets generates the secrets for both Stage and Local environments
+const (
+	secretsTemplateDir = "objstore"
+)
+
+// Secrets generates the secrets for the Production environment
+func (p Production) Secrets() {
+	secrets(p.generator(secretsTemplateDir), p.namespace())
+}
+
+// Secrets generates the secrets for the Stage environment
 func (s Stage) Secrets() {
-	templateDir := "objstore"
-	gen := s.generator(templateDir)
+	secrets(s.generator(secretsTemplateDir), s.namespace())
+}
 
+func secrets(gen *mimic.Generator, ns string) {
 	gen.Add("thanos-telemeter-secret.yaml", encoding.GhodssYAML(
 		openshift.WrapInTemplate(
-			[]runtime.Object{thanosObjectStoreSecret("thanos-objectstorage", s.namespace())},
+			[]runtime.Object{thanosObjectStoreSecret("thanos-objectstorage", ns)},
 			metav1.ObjectMeta{Name: "thanos-telemeter-secret"},
 			[]templatev1.Parameter{
 				{Name: "S3_BUCKET_NAME"},
@@ -31,7 +42,7 @@ func (s Stage) Secrets() {
 	// Generate MST Thanos objectstorage secret
 	gen.Add("thanos-default-secret.yaml", encoding.GhodssYAML(
 		openshift.WrapInTemplate(
-			[]runtime.Object{thanosObjectStoreSecret("observatorium-mst-thanos-objectstorage", s.namespace())},
+			[]runtime.Object{thanosObjectStoreSecret("observatorium-mst-thanos-objectstorage", ns)},
 			metav1.ObjectMeta{Name: "thanos-default-secret"},
 			[]templatev1.Parameter{
 				{Name: "S3_BUCKET_NAME"},
@@ -46,6 +57,7 @@ func (s Stage) Secrets() {
 	gen.Generate()
 }
 
+// Secrets generates the secrets for the Local environment
 func (l Local) Secrets() {
 	templateDir := "objstore"
 	gen := l.generator(templateDir)

magefiles/servicemonitors.go

@@ -11,14 +11,18 @@ import (
 	"k8s.io/utils/ptr"
 )
 
+// ServiceMonitors generates ServiceMonitor resources for the Stage environment.
 func (s Stage) ServiceMonitors() {
 	objs := createServiceMonitors(s.namespace())
 	objs = append(objs, operatorServiceMonitor(s.namespace())...)
 	serviceMonitorTemplateGen(s.generator("servicemonitors"), objs)
 }
 
+// ServiceMonitors generates ServiceMonitor resources for the Production environment.
 func (p Production) ServiceMonitors() {
-	objs := operatorServiceMonitor(p.namespace())
+	ns := p.namespace()
+	objs := createServiceMonitors(ns)
+	objs = append(objs, operatorServiceMonitor(ns)...)
 	serviceMonitorTemplateGen(p.generator("servicemonitors"), objs)
 }