Updating variables and tests

Author: tommyd450

api/v1alpha1/rekor_types.go

@@ -29,12 +29,14 @@ type RekorSpec struct {
 	BackFillRedis BackFillRedis `json:"backFillRedis,omitempty"`
 	// Trillian Log Server End point
 	//+kubebuilder:default:="trillian-logserver"
+	//+optional
 	TrillianAddress string `json:"trillianAddress,omitempty"`
 	// Trillian Log Server End point
 	//+kubebuilder:validation:Minimum:=1
 	//+kubebuilder:validation:Maximum:=65535
 	//+kubebuilder:default:=8091
-	TrillianPort int32 `json:"trillianPort,omitempty"`
+	//+optional
+	TrillianPort *int32 `json:"trillianPort,omitempty"`
 }
 
 type RekorSigner struct {

api/v1alpha1/rekor_types_test.go

@@ -196,6 +196,7 @@ var _ = Describe("Rekor", func() {
 				It("outputs the CR", func() {
 					storage := k8sresource.MustParse("987Gi")
 					tree := int64(1269875)
+					port := int32(8091)
 
 					rekorInstance = Rekor{
 						ObjectMeta: metav1.ObjectMeta{
@@ -239,6 +240,8 @@ var _ = Describe("Rekor", func() {
 									Key: "key",
 								},
 							},
+							TrillianAddress: "trillian-system",
+							TrillianPort:    &port,
 						},
 					}
 
@@ -252,7 +255,7 @@ var _ = Describe("Rekor", func() {
 			When("CR is partially set", func() {
 
 				It("sets spec.pvc.storage if spec.pvc is partially set", func() {
-
+					//port := int32(8091)
 					rekorInstance = Rekor{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "rekor-storage",
@@ -279,6 +282,7 @@ var _ = Describe("Rekor", func() {
 
 func generateRekorObject(name string) *Rekor {
 	storage := k8sresource.MustParse("5Gi")
+	port := int32(8091)
 	return &Rekor{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -296,6 +300,8 @@ func generateRekorObject(name string) *Rekor {
 				Retain: utils.Pointer(true),
 				Size:   &storage,
 			},
+			TrillianAddress: "trillian-logserver",
+			TrillianPort:    &port,
 		},
 	}
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -23,7 +23,7 @@ func CreateRekorDeployment(instance *v1alpha1.Rekor, dpName string, sa string, l
 	appArgs := []string{
 		"serve",
 		"--trillian_log_server.address=" + instance.Spec.TrillianAddress,
-		"--trillian_log_server.port=" + instance.Spec.TrillianPort,
+		fmt.Sprintf("--trillian_log_server.port=%d", *instance.Spec.TrillianPort),
 		"--trillian_log_server.sharding_config=/sharding/sharding-config.yaml",
 		"--redis_server.address=rekor-redis",
 		"--redis_server.port=6379",