Tweaking variables

securesign · Feb 26, 2024 · f4c345c · f4c345c
1 parent 7b86838
commit f4c345c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
@@ -177,7 +177,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-02-21T11:21:05Z"
+    createdAt: "2024-02-21T11:25:54Z"
     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/config/samples/rhtas_v1alpha1_securesign.yaml b/config/samples/rhtas_v1alpha1_securesign.yaml
@@ -12,6 +12,8 @@ spec:
       enabled: true
     monitoring:
       enabled: false
+    externalTrillian: "trillian-system"
+    treeID: 659380575283371362
   trillian:
     database:
       create: true
@@ -20,9 +22,9 @@ spec:
       enabled: true
     config:
       OIDCIssuers:
-        "https://your-oidc-issuer-url":
-          ClientID: "trusted-artifact-signer"
-          IssuerURL: "https://your-oidc-issuer-url"
+        "https://keycloak-keycloak-system.apps.rosa.p7jmz-78iyu-99u.d41a.p3.openshiftapps.com/auth/realms/sigstore":
+          ClientID: "sigstore"
+          IssuerURL: "https://keycloak-keycloak-system.apps.rosa.p7jmz-78iyu-99u.d41a.p3.openshiftapps.com/auth/realms/sigstore"
           Type: "email"
     certificate:
       organizationName: Red Hat
@@ -33,4 +35,3 @@ spec:
   tuf:
     externalAccess:
       enabled: true
-  ctlog:
diff --git a/controllers/rekor/utils/rekor_deployment.go b/controllers/rekor/utils/rekor_deployment.go
@@ -15,15 +15,14 @@ func CreateRekorDeployment(instance *v1alpha1.Rekor, dpName string, sa string, l
 
 	trillianNamespace := instance.Namespace
 	trillianPort := "8091"
-	if instance.Spec.ExternalTrillianUrl != "" || instance.Spec.ExternalTrillianUrl != nil {
+	if instance.Spec.ExternalTrillianUrl != "" {
 		trillianNamespace = instance.Spec.ExternalTrillianUrl
 	}
 
-	if instance.Spec.trillianPort != nil {
-		trillianPort = instance.Spec.trillianPort
+	if instance.Spec.TrillianPort != nil {
+		trillianPort = instance.Spec.TrillianPort
 	}
 
-
 	appArgs := []string{
 		"serve",
 		"--trillian_log_server.address=" + instance.Spec.ExternalTrillian + "",