Merge remote-tracking branch 'origin/main' into 646-bringing-your-own-registry

Author: dzsak

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
 
     - id: go-cache-paths
       run: |
@@ -68,7 +68,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: Set Node version
       uses: actions/setup-node@v3
       with:
@@ -108,7 +108,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - id: go-cache-paths
       run: |
         echo "::set-output name=go-build::$(go env GOCACHE)"
@@ -140,7 +140,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - id: go-cache-paths
       run: |
         echo "::set-output name=go-build::$(go env GOCACHE)"
@@ -172,7 +172,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: ⬇️ Check out code into the Go module directory
       uses: actions/checkout@v1
       with:
@@ -188,7 +188,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: ⬇️ Check out code into the Go module directory
       uses: actions/checkout@v1
       with:

.github/workflows/publish-cli.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: ⬇️ Check out code into the Go module directory
       uses: actions/checkout@v3
       with:

.github/workflows/publish-image-builder.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: ⬇️ Check out code into the Go module directory
       uses: actions/checkout@v3
       with:

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.0
+        go-version: 1.22.1
     - name: ⬇️ Check out code into the Go module directory
       uses: actions/checkout@v3
       with:

cmd/dashboard/dashboard.go

@@ -100,12 +100,9 @@ func main() {
 	)
 	go alertStateManager.Run()
 
-	stopCh := make(chan struct{})
+	stopCh := make(chan os.Signal, 1)
 	defer close(stopCh)
-
-	gimletdStopCh := make(chan os.Signal, 1)
-	signal.Notify(gimletdStopCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
-	waitCh := make(chan struct{})
+	signal.Notify(stopCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 
 	if config.GitopsRepo != "" || config.GitopsRepoDeployKeyPath != "" {
 		panic("GITOPS_REPO and GITOPS_REPO_DEPLOY_KEY_PATH are deprecated." +
@@ -148,10 +145,13 @@ func main() {
 	go repoCache.Run()
 	log.Info("Repo cache initialized")
 
+	gitopsQueue := make(chan int, 1000)
+
 	artifactsWorker := worker.NewArtifactsWorker(
 		repoCache,
 		store,
 		triggerArtifactGeneration,
+		gitopsQueue,
 	)
 	go artifactsWorker.Run()
 
@@ -166,7 +166,7 @@ func main() {
 		go weeklyReporter.Run()
 	}
 
-	imageBuildWorker := worker.NewImageBuildWorker(store, successfullImageBuilds)
+	imageBuildWorker := worker.NewImageBuildWorker(store, successfullImageBuilds, gitopsQueue)
 	go imageBuildWorker.Run()
 
 	chartUpdatePullRequests := map[string]interface{}{}
@@ -213,9 +213,9 @@ func main() {
 		perf,
 		gitUser,
 		config.GitHost,
+		gitopsQueue,
 	)
 	go gitopsWorker.Run()
-	log.Info("Gitops worker started")
 
 	if config.ReleaseStats == "enabled" {
 		releaseStateWorker := &worker.ReleaseStateWorker{
@@ -268,6 +268,7 @@ func main() {
 		logger,
 		gitServer,
 		gitUser,
+		gitopsQueue,
 	)
 
 	go func() {
@@ -285,7 +286,8 @@ func main() {
 		}
 	}
 
-	<-waitCh
+	<-stopCh
+	close(gitopsQueue)
 	log.Info("Successfully cleaned up resources. Stopping.")
 }
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/gimlet-io/gimlet-cli
 
-go 1.22
+go 1.22.1
 
 // Replace digest lib to master to gather access to BLAKE3.
 // xref: https://github.com/opencontainers/go-digest/pull/66
@@ -80,7 +80,7 @@ require (
 	k8s.io/api v0.29.2
 	k8s.io/apimachinery v0.29.2
 	k8s.io/client-go v0.29.2
-	modernc.org/sqlite v1.24.0
+	modernc.org/sqlite v1.29.4
 	sigs.k8s.io/kustomize/api v0.16.0
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -108,16 +108,21 @@ require (
 	github.com/go-git/go-git-fixtures/v4 v4.3.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
 	github.com/gookit/color v1.5.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lestrrat-go/httprc v1.0.5 // indirect
 	github.com/lestrrat-go/jwx/v2 v2.0.21 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
+	github.com/miekg/dns v1.1.43 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/onsi/ginkgo/v2 v2.15.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
@@ -131,15 +136,17 @@ require (
 	golang.org/x/tools v0.18.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 // indirect
 	gopkg.in/evanphx/json-patch.v5 v5.9.0 // indirect
+	gotest.tools/v3 v3.5.0 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
-	modernc.org/cc/v3 v3.40.0 // indirect
-	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.22.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
+	modernc.org/cc/v3 v3.41.0 // indirect
+	modernc.org/ccgo/v3 v3.16.15 // indirect
+	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
+	modernc.org/libc v1.41.0 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
 	modernc.org/opt v0.1.3 // indirect
-	modernc.org/strutil v1.1.3 // indirect
-	modernc.org/token v1.0.1 // indirect
+	modernc.org/strutil v1.2.0 // indirect
+	modernc.org/token v1.1.0 // indirect
 )
 
 require (
@@ -195,7 +202,7 @@ require (
 	github.com/go-openapi/jsonreference v0.20.4 // indirect
 	github.com/go-openapi/swag v0.22.9 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/gofrs/uuid v4.2.0+incompatible // indirect
+	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gomarkdown/markdown v0.0.0-20191123064959-2c17d62f5098 // indirect
@@ -278,7 +285,7 @@ require (
 	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/grpc v1.62.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect