Skip to content

Commit f8648bb

Browse files
rytswdrytswd
authored
Merge pull request #95 from numtide/fix-ghcr-default-image
Fix base image to multigres:main instead of multigres:latest
2 parents 94576a4 + 5055dad commit f8648bb

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎pkg/resource-handler/controller/cell/integration_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func TestCellReconciliation(t *testing.T) {
103103
Containers: []corev1.Container{
104104
{
105105
Name: "multigateway",
106-
Image: "ghcr.io/multigres/multigres:latest",
106+
Image: "ghcr.io/multigres/multigres:main",
107107
Args: []string{
108108
"multigateway",
109109
"--http-port", "15100",
@@ -187,7 +187,7 @@ func TestCellReconciliation(t *testing.T) {
187187
Containers: []corev1.Container{
188188
{
189189
Name: "multigateway",
190-
Image: "ghcr.io/multigres/multigres:latest",
190+
Image: "ghcr.io/multigres/multigres:main",
191191
Args: []string{
192192
"multigateway",
193193
"--http-port", "15100",
@@ -373,7 +373,7 @@ func TestCellReconciliation(t *testing.T) {
373373
Containers: []corev1.Container{
374374
{
375375
Name: "multigateway",
376-
Image: "ghcr.io/multigres/multigres:latest",
376+
Image: "ghcr.io/multigres/multigres:main",
377377
Args: []string{
378378
"multigateway",
379379
"--http-port", "15100",

‎pkg/resource-handler/controller/cell/multigateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const (
2222
DefaultMultiGatewayReplicas int32 = 2
2323

2424
// DefaultMultiGatewayImage is the default MultiGateway container image
25-
DefaultMultiGatewayImage = "ghcr.io/multigres/multigres:latest"
25+
DefaultMultiGatewayImage = "ghcr.io/multigres/multigres:main"
2626

2727
// MultiGatewayHTTPPort is the default port for HTTP connections
2828
MultiGatewayHTTPPort int32 = 15100

‎pkg/resource-handler/controller/shard/containers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
const (
1212
// DefaultMultigresImage is the base image for all Multigres components (multipooler, multiorch, pgctld)
1313
// Different components use different subcommands.
14-
DefaultMultigresImage = "ghcr.io/multigres/multigres:latest"
14+
DefaultMultigresImage = "ghcr.io/multigres/multigres:main"
1515

1616
// DefaultPostgresImage is the default PostgreSQL database container image
1717
DefaultPostgresImage = "postgres:17"

‎pkg/resource-handler/controller/shard/integration_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func TestShardReconciliation(t *testing.T) {
6969
TableGroupName: "default",
7070
ShardName: "0",
7171
Images: multigresv1alpha1.ShardImages{
72-
MultiOrch: "ghcr.io/multigres/multigres:latest",
73-
MultiPooler: "ghcr.io/multigres/multigres:latest",
72+
MultiOrch: "ghcr.io/multigres/multigres:main",
73+
MultiPooler: "ghcr.io/multigres/multigres:main",
7474
Postgres: "postgres:17",
7575
},
7676
GlobalTopoServer: multigresv1alpha1.GlobalTopoServerRef{
@@ -115,7 +115,7 @@ func TestShardReconciliation(t *testing.T) {
115115
Containers: []corev1.Container{
116116
{
117117
Name: "multiorch",
118-
Image: "ghcr.io/multigres/multigres:latest",
118+
Image: "ghcr.io/multigres/multigres:main",
119119
Args: []string{
120120
"multiorch",
121121
"--http-port", "15300",
@@ -173,7 +173,7 @@ func TestShardReconciliation(t *testing.T) {
173173
Containers: []corev1.Container{
174174
{
175175
Name: "multiorch",
176-
Image: "ghcr.io/multigres/multigres:latest",
176+
Image: "ghcr.io/multigres/multigres:main",
177177
Args: []string{
178178
"multiorch",
179179
"--http-port", "15300",
@@ -235,7 +235,7 @@ func TestShardReconciliation(t *testing.T) {
235235
InitContainers: []corev1.Container{
236236
{
237237
Name: "pgctld-init",
238-
Image: "ghcr.io/multigres/multigres:latest",
238+
Image: "ghcr.io/multigres/multigres:main",
239239
Args: []string{
240240
"pgctld",
241241
"copy-binary",
@@ -247,7 +247,7 @@ func TestShardReconciliation(t *testing.T) {
247247
},
248248
{
249249
Name: "multipooler",
250-
Image: "ghcr.io/multigres/multigres:latest",
250+
Image: "ghcr.io/multigres/multigres:main",
251251
Args: []string{
252252
"multipooler",
253253
"--http-port", "15200",
@@ -340,8 +340,8 @@ func TestShardReconciliation(t *testing.T) {
340340
TableGroupName: "default",
341341
ShardName: "0",
342342
Images: multigresv1alpha1.ShardImages{
343-
MultiOrch: "ghcr.io/multigres/multigres:latest",
344-
MultiPooler: "ghcr.io/multigres/multigres:latest",
343+
MultiOrch: "ghcr.io/multigres/multigres:main",
344+
MultiPooler: "ghcr.io/multigres/multigres:main",
345345
Postgres: "postgres:17",
346346
},
347347
GlobalTopoServer: multigresv1alpha1.GlobalTopoServerRef{
@@ -386,7 +386,7 @@ func TestShardReconciliation(t *testing.T) {
386386
Containers: []corev1.Container{
387387
{
388388
Name: "multiorch",
389-
Image: "ghcr.io/multigres/multigres:latest",
389+
Image: "ghcr.io/multigres/multigres:main",
390390
Args: []string{
391391
"multiorch",
392392
"--http-port", "15300",
@@ -444,7 +444,7 @@ func TestShardReconciliation(t *testing.T) {
444444
Containers: []corev1.Container{
445445
{
446446
Name: "multiorch",
447-
Image: "ghcr.io/multigres/multigres:latest",
447+
Image: "ghcr.io/multigres/multigres:main",
448448
Args: []string{
449449
"multiorch",
450450
"--http-port", "15300",
@@ -511,7 +511,7 @@ func TestShardReconciliation(t *testing.T) {
511511
InitContainers: []corev1.Container{
512512
{
513513
Name: "pgctld-init",
514-
Image: "ghcr.io/multigres/multigres:latest",
514+
Image: "ghcr.io/multigres/multigres:main",
515515
Args: []string{
516516
"pgctld",
517517
"copy-binary",
@@ -523,7 +523,7 @@ func TestShardReconciliation(t *testing.T) {
523523
},
524524
{
525525
Name: "multipooler",
526-
Image: "ghcr.io/multigres/multigres:latest",
526+
Image: "ghcr.io/multigres/multigres:main",
527527
Args: []string{
528528
"multipooler",
529529
"--http-port", "15200",
@@ -630,7 +630,7 @@ func TestShardReconciliation(t *testing.T) {
630630
InitContainers: []corev1.Container{
631631
{
632632
Name: "pgctld-init",
633-
Image: "ghcr.io/multigres/multigres:latest",
633+
Image: "ghcr.io/multigres/multigres:main",
634634
Args: []string{
635635
"pgctld",
636636
"copy-binary",
@@ -642,7 +642,7 @@ func TestShardReconciliation(t *testing.T) {
642642
},
643643
{
644644
Name: "multipooler",
645-
Image: "ghcr.io/multigres/multigres:latest",
645+
Image: "ghcr.io/multigres/multigres:main",
646646
Args: []string{
647647
"multipooler",
648648
"--http-port", "15200",

0 commit comments

Comments
 (0)