Skip to content

Commit 705605e

Browse files
authored
chore: move default images repositories and tags to globals (#916)
Signed-off-by: GitHub <[email protected]>
1 parent a757552 commit 705605e

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,21 @@ type DefaultFlowSpec struct {
113113
}
114114

115115
const (
116-
DefaultFluentbitImageRepository = "fluent/fluent-bit"
117-
DefaultFluentbitImageTag = "1.8.9"
118-
DefaultFluentdImageRepository = "ghcr.io/banzaicloud/fluentd"
119-
DefaultFluentdImageTag = "v1.14.4-alpine-1"
120-
DefaultFluentdBufferStorageVolumeName = "fluentd-buffer"
121-
DefaultFluentdDrainWatchImageRepository = "ghcr.io/banzaicloud/fluentd-drain-watch"
122-
DefaultFluentdDrainWatchImageTag = "v0.0.1"
123-
DefaultFluentdDrainPauseImageRepository = "k8s.gcr.io/pause"
124-
DefaultFluentdDrainPauseImageTag = "latest"
116+
DefaultFluentbitImageRepository = "fluent/fluent-bit"
117+
DefaultFluentbitImageTag = "1.8.9"
118+
DefaultFluentdImageRepository = "ghcr.io/banzaicloud/fluentd"
119+
DefaultFluentdImageTag = "v1.14.4-alpine-1"
120+
DefaultFluentdBufferStorageVolumeName = "fluentd-buffer"
121+
DefaultFluentdDrainWatchImageRepository = "ghcr.io/banzaicloud/fluentd-drain-watch"
122+
DefaultFluentdDrainWatchImageTag = "v0.0.1"
123+
DefaultFluentdDrainPauseImageRepository = "k8s.gcr.io/pause"
124+
DefaultFluentdDrainPauseImageTag = "latest"
125+
DefaultFluentdVolumeModeImageRepository = "busybox"
126+
DefaultFluentdVolumeModeImageTag = "latest"
127+
DefaultFluentdConfigReloaderImageRepository = "jimmidyson/configmap-reload"
128+
DefaultFluentdConfigReloaderImageTag = "v0.4.0"
129+
DefaultFluentdBufferVolumeImageRepository = "quay.io/prometheus/node-exporter"
130+
DefaultFluentdBufferVolumeImageTag = "v1.1.2"
125131
)
126132

127133
// SetDefaults fills empty attributes
@@ -206,28 +212,28 @@ func (l *Logging) SetDefaults() error {
206212
}
207213
}
208214
if l.Spec.FluentdSpec.VolumeModImage.Repository == "" {
209-
l.Spec.FluentdSpec.VolumeModImage.Repository = "busybox"
215+
l.Spec.FluentdSpec.VolumeModImage.Repository = DefaultFluentdVolumeModeImageRepository
210216
}
211217
if l.Spec.FluentdSpec.VolumeModImage.Tag == "" {
212-
l.Spec.FluentdSpec.VolumeModImage.Tag = "latest"
218+
l.Spec.FluentdSpec.VolumeModImage.Tag = DefaultFluentdVolumeModeImageTag
213219
}
214220
if l.Spec.FluentdSpec.VolumeModImage.PullPolicy == "" {
215221
l.Spec.FluentdSpec.VolumeModImage.PullPolicy = "IfNotPresent"
216222
}
217223
if l.Spec.FluentdSpec.ConfigReloaderImage.Repository == "" {
218-
l.Spec.FluentdSpec.ConfigReloaderImage.Repository = "jimmidyson/configmap-reload"
224+
l.Spec.FluentdSpec.ConfigReloaderImage.Repository = DefaultFluentdConfigReloaderImageRepository
219225
}
220226
if l.Spec.FluentdSpec.ConfigReloaderImage.Tag == "" {
221-
l.Spec.FluentdSpec.ConfigReloaderImage.Tag = "v0.4.0"
227+
l.Spec.FluentdSpec.ConfigReloaderImage.Tag = DefaultFluentdConfigReloaderImageTag
222228
}
223229
if l.Spec.FluentdSpec.ConfigReloaderImage.PullPolicy == "" {
224230
l.Spec.FluentdSpec.ConfigReloaderImage.PullPolicy = "IfNotPresent"
225231
}
226232
if l.Spec.FluentdSpec.BufferVolumeImage.Repository == "" {
227-
l.Spec.FluentdSpec.BufferVolumeImage.Repository = "quay.io/prometheus/node-exporter"
233+
l.Spec.FluentdSpec.BufferVolumeImage.Repository = DefaultFluentdBufferVolumeImageRepository
228234
}
229235
if l.Spec.FluentdSpec.BufferVolumeImage.Tag == "" {
230-
l.Spec.FluentdSpec.BufferVolumeImage.Tag = "v1.1.2"
236+
l.Spec.FluentdSpec.BufferVolumeImage.Tag = DefaultFluentdBufferVolumeImageTag
231237
}
232238
if l.Spec.FluentdSpec.BufferVolumeImage.PullPolicy == "" {
233239
l.Spec.FluentdSpec.BufferVolumeImage.PullPolicy = "IfNotPresent"

0 commit comments

Comments
 (0)