Initial Test Commit

securesign · Feb 19, 2024 · b54eb19 · b54eb19
1 parent c275a22
commit b54eb19
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 deletions.
diff --git a/api/v1alpha1/rekor_types.go b/api/v1alpha1/rekor_types.go
@@ -23,6 +23,8 @@ type RekorSpec struct {
 	Signer RekorSigner `json:"signer,omitempty"`
 	// BackFillRedis CronJob Configuration
 	BackFillRedis BackFillRedis `json:"backFillRedis,omitempty"`
+	// Trillian External Log Server
+	ExternalTrillian string `json:"externalTrillian,omitempty"`
 }
 
 type RekorSigner struct {

diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
@@ -176,7 +176,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-02-15T11:34:50Z"
+    createdAt: "2024-02-19T13:25:38Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: rhtas-operator.v0.0.1

diff --git a/bundle/manifests/rhtas.redhat.com_rekors.yaml b/bundle/manifests/rhtas.redhat.com_rekors.yaml
@@ -67,6 +67,9 @@ spec:
                     description: Set hostname for your Ingress/Route.
                     type: string
                 type: object
+              externalTrillian:
+                description: Trillian External Log Server
+                type: string
               monitoring:
                 description: Enable Service monitors for rekor
                 properties:

diff --git a/bundle/manifests/rhtas.redhat.com_securesigns.yaml b/bundle/manifests/rhtas.redhat.com_securesigns.yaml
@@ -318,6 +318,9 @@ spec:
                         description: Set hostname for your Ingress/Route.
                         type: string
                     type: object
+                  externalTrillian:
+                    description: Trillian External Log Server
+                    type: string
                   monitoring:
                     description: Enable Service monitors for rekor
                     properties:

diff --git a/config/crd/bases/rhtas.redhat.com_rekors.yaml b/config/crd/bases/rhtas.redhat.com_rekors.yaml
@@ -68,6 +68,9 @@ spec:
                     description: Set hostname for your Ingress/Route.
                     type: string
                 type: object
+              externalTrillian:
+                description: Trillian External Log Server
+                type: string
               monitoring:
                 description: Enable Service monitors for rekor
                 properties:

diff --git a/config/crd/bases/rhtas.redhat.com_securesigns.yaml b/config/crd/bases/rhtas.redhat.com_securesigns.yaml
@@ -319,6 +319,9 @@ spec:
                         description: Set hostname for your Ingress/Route.
                         type: string
                     type: object
+                  externalTrillian:
+                    description: Trillian External Log Server
+                    type: string
                   monitoring:
                     description: Enable Service monitors for rekor
                     properties:

diff --git a/controllers/rekor/utils/rekor_deployment.go b/controllers/rekor/utils/rekor_deployment.go
@@ -12,9 +12,16 @@ import (
 
 func CreateRekorDeployment(instance *v1alpha1.Rekor, dpName string, sa string, labels map[string]string) *apps.Deployment {
 	env := make([]core.EnvVar, 0)
+
+	trillianNamespace := instance.Namespace
+
+	if instance.Spec.ExternalTrillian != "" {
+		trillianNamespace = instance.Spec.ExternalTrillian
+	}
+
 	appArgs := []string{
 		"serve",
-		"--trillian_log_server.address=trillian-logserver." + instance.Namespace + ".svc",
+		"--trillian_log_server.address=trillian-logserver." + trillianNamespace + ".svc",
 		"--trillian_log_server.port=8091",
 		"--trillian_log_server.sharding_config=/sharding/sharding-config.yaml",
 		"--redis_server.address=rekor-redis",