Tweaking Port to be string

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

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/api/v1alpha1/rekor_types.go b/api/v1alpha1/rekor_types.go
@@ -28,7 +28,7 @@ type RekorSpec struct {
 	// Trillian External Log Server
 	ExternalTrillianUrl string `json:"externalTrillian,omitempty"`
 	// External Trillian Port
-	TrillianPort *int64 `json:"trillianPort,omitempty"`
+	TrillianPort string `json:"trillianPort,omitempty"`
 }
 
 type RekorSigner struct {

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:10:30Z"
+    createdAt: "2024-02-21T11:21:05Z"
     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
@@ -146,8 +146,7 @@ spec:
                 type: integer
               trillianPort:
                 description: External Trillian Port
-                format: int64
-                type: integer
+                type: string
             type: object
           status:
             description: RekorStatus defines the observed state of Rekor

diff --git a/bundle/manifests/rhtas.redhat.com_securesigns.yaml b/bundle/manifests/rhtas.redhat.com_securesigns.yaml
@@ -399,8 +399,7 @@ spec:
                     type: integer
                   trillianPort:
                     description: External Trillian Port
-                    format: int64
-                    type: integer
+                    type: string
                 type: object
               trillian:
                 description: TrillianSpec defines the desired state of Trillian

diff --git a/config/crd/bases/rhtas.redhat.com_rekors.yaml b/config/crd/bases/rhtas.redhat.com_rekors.yaml
@@ -152,8 +152,7 @@ spec:
                 type: integer
               trillianPort:
                 description: External Trillian Port
-                format: int64
-                type: integer
+                type: string
             type: object
           status:
             description: RekorStatus defines the observed state of Rekor

diff --git a/config/crd/bases/rhtas.redhat.com_securesigns.yaml b/config/crd/bases/rhtas.redhat.com_securesigns.yaml
@@ -405,8 +405,7 @@ spec:
                     type: integer
                   trillianPort:
                     description: External Trillian Port
-                    format: int64
-                    type: integer
+                    type: string
                 type: object
               trillian:
                 description: TrillianSpec defines the desired state of Trillian

diff --git a/controllers/rekor/utils/rekor_deployment.go b/controllers/rekor/utils/rekor_deployment.go
@@ -14,7 +14,7 @@ func CreateRekorDeployment(instance *v1alpha1.Rekor, dpName string, sa string, l
 	env := make([]core.EnvVar, 0)
 
 	trillianNamespace := instance.Namespace
-	trillianPort := 8091
+	trillianPort := "8091"
 	if instance.Spec.ExternalTrillianUrl != "" || instance.Spec.ExternalTrillianUrl != nil {
 		trillianNamespace = instance.Spec.ExternalTrillianUrl
 	}
@@ -23,12 +23,11 @@ func CreateRekorDeployment(instance *v1alpha1.Rekor, dpName string, sa string, l
 		trillianPort = instance.Spec.trillianPort
 	}
 
-	port := "8091"
 
 	appArgs := []string{
 		"serve",
-		"--trillian_log_server.address=" + instance.Spec.ExternalTrillian +"",
-		"--trillian_log_server.port="+trillianPort+"",
+		"--trillian_log_server.address=" + instance.Spec.ExternalTrillian + "",
+		"--trillian_log_server.port=" + trillianPort + "",
 		"--trillian_log_server.sharding_config=/sharding/sharding-config.yaml",
 		"--redis_server.address=rekor-redis",
 		"--redis_server.port=6379",