Merge pull request #2028 from kube-logging/chore/use-ghcr-for-fluentbit

Author: csatib02

pkg/sdk/extensions/extensionsconfig/config.go

@@ -71,7 +71,7 @@ var Global = GlobalConfig{
 
 // HostTailer configuration
 var HostTailer = HostTailerConfig{
-	FluentBitImage: "docker.io/fluent/fluent-bit:3.2.5",
+	FluentBitImage: "ghcr.io/fluent/fluent-bit:3.2.5",
 	TailerAffix:    "host-tailer",
 }
 
@@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{
 
 // TailerWebhook configuration
 var TailerWebhook = TailerWebhookConfig{
-	FluentBitImage:    "docker.io/fluent/fluent-bit:3.2.5",
+	FluentBitImage:    "ghcr.io/fluent/fluent-bit:3.2.5",
 	AnnotationKey:     "sidecar.logging-extensions.banzaicloud.io/tail",
 	ServerPath:        "/tailer-webhook",
 	ServerPort:        9443,

pkg/sdk/extensions/extensionsconfig/config_test.go

@@ -46,7 +46,7 @@ func TestFluentBitConfigFilePath(t *testing.T) {
 		},
 		{
 			name: "imageVersionInvalid",
-			args: args{image: "docker.io/fluent/[email protected]!unset", filePath: "/dev/stdout"},
+			args: args{image: "ghcr.io/fluent/[email protected]!unset", filePath: "/dev/stdout"},
 			want: []string{"-p", "path=/dev/stdout"},
 		},
 		{
@@ -56,7 +56,7 @@ func TestFluentBitConfigFilePath(t *testing.T) {
 		},
 		{
 			name: "imageVersionLongVersionLess",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.5", filePath: "/dev/stdout"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.5", filePath: "/dev/stdout"},
 			want: []string{"-p", "path=/dev/stdout"},
 		},
 		{
@@ -66,7 +66,7 @@ func TestFluentBitConfigFilePath(t *testing.T) {
 		},
 		{
 			name: "imageVersionLongversionEquals",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.6", filePath: "/dev/stdout"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.6", filePath: "/dev/stdout"},
 			want: []string{"-p", "path=/dev/", "-p", "file=stdout"},
 		},
 		{
@@ -76,22 +76,22 @@ func TestFluentBitConfigFilePath(t *testing.T) {
 		},
 		{
 			name: "imageVersionLongversionGreater",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.7", filePath: "/dev/stdout"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.7", filePath: "/dev/stdout"},
 			want: []string{"-p", "path=/dev/", "-p", "file=stdout"},
 		},
 		{
 			name: "longPath",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.7", filePath: "/var/log/nginx/myaccess.log"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.7", filePath: "/var/log/nginx/myaccess.log"},
 			want: []string{"-p", "path=/var/log/nginx/", "-p", "file=myaccess.log"},
 		},
 		{
 			name: "relativeFilePath",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.7", filePath: "./myaccess.log"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.7", filePath: "./myaccess.log"},
 			want: []string{"-p", "path=./", "-p", "file=myaccess.log"},
 		},
 		{
 			name: "noPathGiven",
-			args: args{image: "docker.io/fluent/fluent-bit:1.4.7", filePath: "myaccess.log"},
+			args: args{image: "ghcr.io/fluent/fluent-bit:1.4.7", filePath: "myaccess.log"},
 			want: []string{"-p", "path=myaccess.log"},
 		},
 	}

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

@@ -198,7 +198,7 @@ type DefaultFlowSpec struct {
 var Version string
 
 const (
-	DefaultFluentbitImageRepository               = "docker.io/fluent/fluent-bit"
+	DefaultFluentbitImageRepository               = "ghcr.io/fluent/fluent-bit"
 	DefaultFluentbitImageTag                      = "3.2.5"
 	DefaultFluentbitBufferVolumeImageRepository   = "ghcr.io/kube-logging/logging-operator/node-exporter"
 	DefaultFluentbitBufferVolumeImageTag          = "latest"