refactor: rename default image and tag

Signed-off-by: Bence Csati <[email protected]>

Author: csatib02

pkg/sdk/logging/api/v1beta1/axosyslog_types.go

@@ -36,6 +36,12 @@ type AxoSyslogSpec struct {
 	// LogPaths is a list of log paths to be rendered in the AxoSyslog configuration
 	LogPaths []LogPath `json:"logPaths,omitempty"`
 
+	// Image is the image specification for AxoSyslog
+	Image *BasicImageSpec `json:"image,omitempty"`
+
+	// ConfigReloadImage is the image specification for the config reload
+	ConfigReloadImage *BasicImageSpec `json:"configReloadImage,omitempty"`
+
 	// Destinations is a list of destinations to be rendered in the AxoSyslog configuration
 	Destinations []Destination `json:"destinations,omitempty"`
 }
@@ -92,11 +98,33 @@ func init() {
 }
 
 func (a *AxoSyslog) SetDefaults() error {
-	if a.Spec.LogPaths == nil {
-		a.Spec.LogPaths = []LogPath{}
-	}
-	if a.Spec.Destinations == nil {
-		a.Spec.Destinations = []Destination{}
+	if a != nil {
+		if a.Spec.LogPaths == nil {
+			a.Spec.LogPaths = []LogPath{}
+		}
+		if a.Spec.Destinations == nil {
+			a.Spec.Destinations = []Destination{}
+		}
+
+		if a.Spec.Image == nil {
+			a.Spec.Image = &BasicImageSpec{
+				Repository: defaultAxoSyslogImageRepository,
+				Tag:        defaultAxoSyslogImageTag,
+			}
+		}
+		if a.Spec.ConfigReloadImage == nil {
+			a.Spec.ConfigReloadImage = &BasicImageSpec{}
+		}
+		if a.Spec.ConfigReloadImage.Repository == "" {
+			a.Spec.ConfigReloadImage.Repository = defaultConfigReloaderImageRepository
+		}
+		if a.Spec.ConfigReloadImage.Tag == "" {
+			if Version == "" {
+				a.Spec.ConfigReloadImage.Tag = defaultConfigReloaderImageTag
+			} else {
+				a.Spec.ConfigReloadImage.Tag = Version
+			}
+		}
 	}
 
 	return nil

pkg/sdk/logging/api/v1beta1/syslogng_types.go

@@ -33,8 +33,8 @@ type _hugoSyslogNGSpec interface{} //nolint:deadcode,unused
 type _metaSyslogNGSpec interface{} //nolint:deadcode,unused
 
 const (
-	defaultSyslogngImageRepository           = "ghcr.io/axoflow/axosyslog"
-	defaultSyslogngImageTag                  = "4.11.0"
+	defaultAxoSyslogImageRepository          = "ghcr.io/axoflow/axosyslog"
+	defaultAxoSyslogImageTag                 = "4.11.0"
 	defaultPrometheusExporterImageRepository = "ghcr.io/axoflow/axosyslog-metrics-exporter"
 	defaultPrometheusExporterImageTag        = "0.0.9"
 	defaultConfigReloaderImageRepository     = "ghcr.io/kube-logging/logging-operator/syslog-ng-reloader"
@@ -144,8 +144,8 @@ func (s *SyslogNGSpec) SetDefaults() {
 		}
 		if s.SyslogNGImage == nil {
 			s.SyslogNGImage = &BasicImageSpec{
-				Repository: defaultSyslogngImageRepository,
-				Tag:        defaultSyslogngImageTag,
+				Repository: defaultAxoSyslogImageRepository,
+				Tag:        defaultAxoSyslogImageTag,
 			}
 		}
 		if s.ConfigReloadImage == nil {