move Status.TLSConfiguration checking login into NewDatbase/NewStorage functions

nikitka · nikitka · commit 3b02f608b2c8 · 2024-06-14T17:16:42.000+02:00
diff --git a/api/v1alpha1/database_types.go b/api/v1alpha1/database_types.go
@@ -269,5 +269,5 @@ func (r *Database) AnyCertificatesAdded() bool {
 	return len(r.Spec.CABundle) > 0 ||
 		r.Spec.Service.GRPC.TLSConfiguration.Enabled ||
 		r.Spec.Service.Interconnect.TLSConfiguration.Enabled ||
-		(r.Spec.Service.Status.TLSConfiguration != nil && r.Spec.Service.Status.TLSConfiguration.Enabled)
+		r.Spec.Service.Status.TLSConfiguration.Enabled
 }
diff --git a/api/v1alpha1/storage_types.go b/api/v1alpha1/storage_types.go
@@ -243,5 +243,5 @@ func (r *Storage) AnyCertificatesAdded() bool {
 	return len(r.Spec.CABundle) > 0 ||
 		r.Spec.Service.GRPC.TLSConfiguration.Enabled ||
 		r.Spec.Service.Interconnect.TLSConfiguration.Enabled ||
-		(r.Spec.Service.Status.TLSConfiguration != nil && r.Spec.Service.Status.TLSConfiguration.Enabled)
+		r.Spec.Service.Status.TLSConfiguration.Enabled
 }
diff --git a/internal/resources/database.go b/internal/resources/database.go
@@ -17,6 +17,10 @@ type DatabaseBuilder struct {
 func NewDatabase(ydbCr *api.Database) DatabaseBuilder {
 	cr := ydbCr.DeepCopy()
 
+	if cr.Spec.Service.Status.TLSConfiguration == nil {
+		cr.Spec.Service.Status.TLSConfiguration = &api.TLSConfiguration{Enabled: false}
+	}
+
 	return DatabaseBuilder{Database: cr, Storage: nil}
 }
 
diff --git a/internal/resources/database_statefulset.go b/internal/resources/database_statefulset.go
@@ -168,7 +168,7 @@ func (b *DatabaseStatefulSetBuilder) buildVolumes() []corev1.Volume {
 		volumes = append(volumes, buildTLSVolume(interconnectTLSVolumeName, b.Spec.Service.Interconnect.TLSConfiguration))
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumes = append(volumes,
 			buildTLSVolume(statusOriginTLSVolumeName, b.Spec.Service.Status.TLSConfiguration),
 			corev1.Volume{
@@ -306,7 +306,7 @@ func (b *DatabaseStatefulSetBuilder) buildCaStorePatchingInitContainerVolumeMoun
 		})
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      statusOriginTLSVolumeName,
 			ReadOnly:  true,
@@ -474,7 +474,7 @@ func (b *DatabaseStatefulSetBuilder) buildVolumeMounts() []corev1.VolumeMount {
 		})
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      statusTLSVolumeName,
 			ReadOnly:  true,
@@ -583,7 +583,7 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 		)
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		args = append(args,
 			"--mon-cert",
 			fmt.Sprintf("%s/%s", statusTLSVolumeMountPath, statusBundleFileName),
diff --git a/internal/resources/storage.go b/internal/resources/storage.go
@@ -16,6 +16,10 @@ type StorageClusterBuilder struct {
 func NewCluster(ydbCr *api.Storage) StorageClusterBuilder {
 	cr := ydbCr.DeepCopy()
 
+	if cr.Spec.Service.Status.TLSConfiguration == nil {
+		cr.Spec.Service.Status.TLSConfiguration = &api.TLSConfiguration{Enabled: false}
+	}
+
 	return StorageClusterBuilder{cr}
 }
 
diff --git a/internal/resources/storage_statefulset.go b/internal/resources/storage_statefulset.go
@@ -212,7 +212,7 @@ func (b *StorageStatefulSetBuilder) buildVolumes() []corev1.Volume {
 		volumes = append(volumes, buildTLSVolume(interconnectTLSVolumeName, b.Spec.Service.Interconnect.TLSConfiguration))
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumes = append(volumes,
 			buildTLSVolume(statusOriginTLSVolumeName, b.Spec.Service.Status.TLSConfiguration),
 			corev1.Volume{
@@ -329,7 +329,7 @@ func (b *StorageStatefulSetBuilder) buildCaStorePatchingInitContainerVolumeMount
 		})
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      statusOriginTLSVolumeName,
 			ReadOnly:  true,
@@ -446,7 +446,7 @@ func (b *StorageStatefulSetBuilder) buildVolumeMounts() []corev1.VolumeMount {
 		})
 	}
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      statusTLSVolumeName,
 			ReadOnly:  true,
@@ -506,7 +506,7 @@ func (b *StorageStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 		fmt.Sprintf("%s=%s", api.LabelDeploymentKey, api.LabelDeploymentValueKubernetes),
 	)
 
-	if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {
+	if b.Spec.Service.Status.TLSConfiguration.Enabled {
 		args = append(args,
 			"--mon-cert",
 			fmt.Sprintf("%s/%s", statusTLSVolumeMountPath, statusBundleFileName),

Original file line number	Diff line number	Diff line change
`@@ -269,5 +269,5 @@ func (r *Database) AnyCertificatesAdded() bool {`
`269`	`269`	`return len(r.Spec.CABundle) > 0 \|\|`
`270`	`270`	`r.Spec.Service.GRPC.TLSConfiguration.Enabled \|\|`
`271`	`271`	`r.Spec.Service.Interconnect.TLSConfiguration.Enabled \|\|`
`272`		`- (r.Spec.Service.Status.TLSConfiguration != nil && r.Spec.Service.Status.TLSConfiguration.Enabled)`
	`272`	`+ r.Spec.Service.Status.TLSConfiguration.Enabled`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,5 +243,5 @@ func (r *Storage) AnyCertificatesAdded() bool {`
`243`	`243`	`return len(r.Spec.CABundle) > 0 \|\|`
`244`	`244`	`r.Spec.Service.GRPC.TLSConfiguration.Enabled \|\|`
`245`	`245`	`r.Spec.Service.Interconnect.TLSConfiguration.Enabled \|\|`
`246`		`- (r.Spec.Service.Status.TLSConfiguration != nil && r.Spec.Service.Status.TLSConfiguration.Enabled)`
	`246`	`+ r.Spec.Service.Status.TLSConfiguration.Enabled`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ type DatabaseBuilder struct {`
`17`	`17`	`func NewDatabase(ydbCr *api.Database) DatabaseBuilder {`
`18`	`18`	`cr := ydbCr.DeepCopy()`
`19`	`19`
	`20`	`+ if cr.Spec.Service.Status.TLSConfiguration == nil {`
	`21`	`+ cr.Spec.Service.Status.TLSConfiguration = &api.TLSConfiguration{Enabled: false}`
	`22`	`+ }`
	`23`	`+`
`20`	`24`	`return DatabaseBuilder{Database: cr, Storage: nil}`
`21`	`25`	`}`
`22`	`26`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func (b *DatabaseStatefulSetBuilder) buildVolumes() []corev1.Volume {`
`168`	`168`	`volumes = append(volumes, buildTLSVolume(interconnectTLSVolumeName, b.Spec.Service.Interconnect.TLSConfiguration))`
`169`	`169`	`}`
`170`	`170`
`171`		`- if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {`
	`171`	`+ if b.Spec.Service.Status.TLSConfiguration.Enabled {`
`172`	`172`	`volumes = append(volumes,`
`173`	`173`	`buildTLSVolume(statusOriginTLSVolumeName, b.Spec.Service.Status.TLSConfiguration),`
`174`	`174`	`corev1.Volume{`
`@@ -306,7 +306,7 @@ func (b *DatabaseStatefulSetBuilder) buildCaStorePatchingInitContainerVolumeMoun`
`306`	`306`	`})`
`307`	`307`	`}`
`308`	`308`
`309`		`- if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {`
	`309`	`+ if b.Spec.Service.Status.TLSConfiguration.Enabled {`
`310`	`310`	`volumeMounts = append(volumeMounts, corev1.VolumeMount{`
`311`	`311`	`Name: statusOriginTLSVolumeName,`
`312`	`312`	`ReadOnly: true,`
`@@ -474,7 +474,7 @@ func (b *DatabaseStatefulSetBuilder) buildVolumeMounts() []corev1.VolumeMount {`
`474`	`474`	`})`
`475`	`475`	`}`
`476`	`476`
`477`		`- if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {`
	`477`	`+ if b.Spec.Service.Status.TLSConfiguration.Enabled {`
`478`	`478`	`volumeMounts = append(volumeMounts, corev1.VolumeMount{`
`479`	`479`	`Name: statusTLSVolumeName,`
`480`	`480`	`ReadOnly: true,`
`@@ -583,7 +583,7 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {`
`583`	`583`	`)`
`584`	`584`	`}`
`585`	`585`
`586`		`- if b.Spec.Service.Status.TLSConfiguration != nil && b.Spec.Service.Status.TLSConfiguration.Enabled {`
	`586`	`+ if b.Spec.Service.Status.TLSConfiguration.Enabled {`
`587`	`587`	`args = append(args,`
`588`	`588`	`"--mon-cert",`
`589`	`589`	`fmt.Sprintf("%s/%s", statusTLSVolumeMountPath, statusBundleFileName),`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ type StorageClusterBuilder struct {`
`16`	`16`	`func NewCluster(ydbCr *api.Storage) StorageClusterBuilder {`
`17`	`17`	`cr := ydbCr.DeepCopy()`
`18`	`18`
	`19`	`+ if cr.Spec.Service.Status.TLSConfiguration == nil {`
	`20`	`+ cr.Spec.Service.Status.TLSConfiguration = &api.TLSConfiguration{Enabled: false}`
	`21`	`+ }`
	`22`	`+`
`19`	`23`	`return StorageClusterBuilder{cr}`
`20`	`24`	`}`
`21`	`25`