mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
* feat(hydrator): add sourceHydrator types Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> fix(codegen): use kube_codegen.sh deepcopy and client gen correctly Signed-off-by: Michael Crenshaw <[email protected]> deepcopy gen Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): add commit-server component Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> go mod tidy Signed-off-by: Michael Crenshaw <[email protected]> one test file for both implementations Signed-off-by: Michael Crenshaw <[email protected]> simplify Signed-off-by: Michael Crenshaw <[email protected]> fix test for linux Signed-off-by: Michael Crenshaw <[email protected]> fix git client mock Signed-off-by: Michael Crenshaw <[email protected]> fix git client mock Signed-off-by: Michael Crenshaw <[email protected]> address comments Signed-off-by: Michael Crenshaw <[email protected]> unit tests Signed-off-by: Michael Crenshaw <[email protected]> lint Signed-off-by: Michael Crenshaw <[email protected]> fix image, fix health checks, fix merge issue Signed-off-by: Michael Crenshaw <[email protected]> fix lint issues Signed-off-by: Michael Crenshaw <[email protected]> remove code that doesn't work for GHE Signed-off-by: Michael Crenshaw <[email protected]> changes from comments Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> allow opt-in Signed-off-by: Michael Crenshaw <[email protected]> separation between app controller and hydrator Signed-off-by: Michael Crenshaw <[email protected]> simplify diff Signed-off-by: Michael Crenshaw <[email protected]> todos Signed-off-by: Michael Crenshaw <[email protected]> simplify Signed-off-by: Michael Crenshaw <[email protected]> add dry sha to logs Signed-off-by: Michael Crenshaw <[email protected]> add app name to logs Signed-off-by: Michael Crenshaw <[email protected]> more logging, no caching Signed-off-by: Michael Crenshaw <[email protected]> fix cluster install Signed-off-by: Michael Crenshaw <[email protected]> don't interrupt an ongoing hydrate operation Signed-off-by: Michael Crenshaw <[email protected]> revert hydrate loop fix Signed-off-by: Michael Crenshaw <[email protected]> handle project-scoped repo creds Signed-off-by: Michael Crenshaw <[email protected]> codegen Signed-off-by: Michael Crenshaw <[email protected]> improve docs Signed-off-by: Michael Crenshaw <[email protected]> fixes from comments Signed-off-by: Michael Crenshaw <[email protected]> * set hydrator enabled key when using hydrator manifests Signed-off-by: Michael Crenshaw <[email protected]> fix manifests Signed-off-by: Michael Crenshaw <[email protected]> improve docs Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> allow opt-in Signed-off-by: Michael Crenshaw <[email protected]> separation between app controller and hydrator Signed-off-by: Michael Crenshaw <[email protected]> simplify diff Signed-off-by: Michael Crenshaw <[email protected]> todos Signed-off-by: Michael Crenshaw <[email protected]> simplify Signed-off-by: Michael Crenshaw <[email protected]> add dry sha to logs Signed-off-by: Michael Crenshaw <[email protected]> add app name to logs Signed-off-by: Michael Crenshaw <[email protected]> more logging, no caching Signed-off-by: Michael Crenshaw <[email protected]> fix cluster install Signed-off-by: Michael Crenshaw <[email protected]> don't interrupt an ongoing hydrate operation Signed-off-by: Michael Crenshaw <[email protected]> revert hydrate loop fix Signed-off-by: Michael Crenshaw <[email protected]> handle project-scoped repo creds Signed-off-by: Michael Crenshaw <[email protected]> codegen Signed-off-by: Michael Crenshaw <[email protected]> improve docs Signed-off-by: Michael Crenshaw <[email protected]> fixes from comments Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): add sourceHydrator types Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> fix(codegen): use kube_codegen.sh deepcopy and client gen correctly Signed-off-by: Michael Crenshaw <[email protected]> deepcopy gen Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> allow opt-in Signed-off-by: Michael Crenshaw <[email protected]> separation between app controller and hydrator Signed-off-by: Michael Crenshaw <[email protected]> simplify diff Signed-off-by: Michael Crenshaw <[email protected]> todos Signed-off-by: Michael Crenshaw <[email protected]> simplify Signed-off-by: Michael Crenshaw <[email protected]> add dry sha to logs Signed-off-by: Michael Crenshaw <[email protected]> add app name to logs Signed-off-by: Michael Crenshaw <[email protected]> more logging, no caching Signed-off-by: Michael Crenshaw <[email protected]> fix cluster install Signed-off-by: Michael Crenshaw <[email protected]> don't interrupt an ongoing hydrate operation Signed-off-by: Michael Crenshaw <[email protected]> revert hydrate loop fix Signed-off-by: Michael Crenshaw <[email protected]> handle project-scoped repo creds Signed-off-by: Michael Crenshaw <[email protected]> codegen Signed-off-by: Michael Crenshaw <[email protected]> * feat(hydrator): write credentials handling + UI Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> feat(hydrator): enable controller Co-authored-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Omer Azmon <[email protected]> Co-authored-by: daengdaengLee <[email protected]> Co-authored-by: Juwon Hwang (Kevin) <[email protected]> Co-authored-by: thisishwan2 <[email protected]> Co-authored-by: mirageoasis <[email protected]> Co-authored-by: Robin Lieb <[email protected]> Co-authored-by: miiiinju1 <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> allow opt-in Signed-off-by: Michael Crenshaw <[email protected]> separation between app controller and hydrator Signed-off-by: Michael Crenshaw <[email protected]> simplify diff Signed-off-by: Michael Crenshaw <[email protected]> todos Signed-off-by: Michael Crenshaw <[email protected]> simplify Signed-off-by: Michael Crenshaw <[email protected]> add dry sha to logs Signed-off-by: Michael Crenshaw <[email protected]> add app name to logs Signed-off-by: Michael Crenshaw <[email protected]> more logging, no caching Signed-off-by: Michael Crenshaw <[email protected]> fix cluster install Signed-off-by: Michael Crenshaw <[email protected]> don't interrupt an ongoing hydrate operation Signed-off-by: Michael Crenshaw <[email protected]> revert hydrate loop fix Signed-off-by: Michael Crenshaw <[email protected]> feat(hydrator): write credentials handling + UI Signed-off-by: Michael Crenshaw <[email protected]> WIP: add new APIs for write creds Signed-off-by: Michael Crenshaw <[email protected]> write api and template api Signed-off-by: Michael Crenshaw <[email protected]> fix time function Signed-off-by: Michael Crenshaw <[email protected]> fix lint issues Signed-off-by: Michael Crenshaw <[email protected]> don't enrich with read creds Signed-off-by: Michael Crenshaw <[email protected]> revert tls change Signed-off-by: Michael Crenshaw <[email protected]> don't disable buttons in UI Signed-off-by: Michael Crenshaw <[email protected]> ask repo server for specific revision Signed-off-by: Michael Crenshaw <[email protected]> fixes Signed-off-by: Michael Crenshaw <[email protected]> lint ui Signed-off-by: Michael Crenshaw <[email protected]> remove unnecessary change Signed-off-by: Michael Crenshaw <[email protected]> fix test and lint Signed-off-by: Michael Crenshaw <[email protected]> lint Signed-off-by: Michael Crenshaw <[email protected]> enable hydrator for e2e tests Signed-off-by: Michael Crenshaw <[email protected]> * free disk space for e2e tests Signed-off-by: Michael Crenshaw <[email protected]> don't free disk space Signed-off-by: Michael Crenshaw <[email protected]> * free disk space for e2e tests Signed-off-by: Michael Crenshaw <[email protected]> * remove comment that breaks auth Signed-off-by: Michael Crenshaw <[email protected]> * try removing extra function Signed-off-by: Michael Crenshaw <[email protected]> * cleanup from comments Signed-off-by: Michael Crenshaw <[email protected]> * fix test Signed-off-by: Michael Crenshaw <[email protected]> --------- Signed-off-by: Michael Crenshaw <[email protected]>
118 lines
4.3 KiB
Go
118 lines
4.3 KiB
Go
package commands
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"os"
|
|
"os/signal"
|
|
"sync"
|
|
"syscall"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
"google.golang.org/grpc/health/grpc_health_v1"
|
|
|
|
cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
|
|
"github.com/argoproj/argo-cd/v2/commitserver"
|
|
"github.com/argoproj/argo-cd/v2/commitserver/apiclient"
|
|
"github.com/argoproj/argo-cd/v2/commitserver/metrics"
|
|
"github.com/argoproj/argo-cd/v2/common"
|
|
"github.com/argoproj/argo-cd/v2/util/askpass"
|
|
"github.com/argoproj/argo-cd/v2/util/cli"
|
|
"github.com/argoproj/argo-cd/v2/util/env"
|
|
"github.com/argoproj/argo-cd/v2/util/errors"
|
|
"github.com/argoproj/argo-cd/v2/util/healthz"
|
|
ioutil "github.com/argoproj/argo-cd/v2/util/io"
|
|
)
|
|
|
|
// NewCommand returns a new instance of an argocd-commit-server command
|
|
func NewCommand() *cobra.Command {
|
|
var (
|
|
listenHost string
|
|
listenPort int
|
|
metricsPort int
|
|
metricsHost string
|
|
)
|
|
command := &cobra.Command{
|
|
Use: "argocd-commit-server",
|
|
Short: "Run Argo CD Commit Server",
|
|
Long: "Argo CD Commit Server is an internal service which commits and pushes hydrated manifests to git. This command runs Commit Server in the foreground.",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
vers := common.GetVersion()
|
|
vers.LogStartupInfo(
|
|
"Argo CD Commit Server",
|
|
map[string]any{
|
|
"port": listenPort,
|
|
},
|
|
)
|
|
|
|
cli.SetLogFormat(cmdutil.LogFormat)
|
|
cli.SetLogLevel(cmdutil.LogLevel)
|
|
|
|
metricsServer := metrics.NewMetricsServer()
|
|
http.Handle("/metrics", metricsServer.GetHandler())
|
|
go func() { errors.CheckError(http.ListenAndServe(fmt.Sprintf("%s:%d", metricsHost, metricsPort), nil)) }()
|
|
|
|
askPassServer := askpass.NewServer(askpass.CommitServerSocketPath)
|
|
go func() { errors.CheckError(askPassServer.Run()) }()
|
|
|
|
server := commitserver.NewServer(askPassServer, metricsServer)
|
|
grpc := server.CreateGRPC()
|
|
|
|
listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", listenHost, listenPort))
|
|
errors.CheckError(err)
|
|
|
|
healthz.ServeHealthCheck(http.DefaultServeMux, func(r *http.Request) error {
|
|
if val, ok := r.URL.Query()["full"]; ok && len(val) > 0 && val[0] == "true" {
|
|
// connect to itself to make sure commit server is able to serve connection
|
|
// used by liveness probe to auto restart commit server
|
|
conn, err := apiclient.NewConnection(fmt.Sprintf("localhost:%d", listenPort))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer ioutil.Close(conn)
|
|
client := grpc_health_v1.NewHealthClient(conn)
|
|
res, err := client.Check(r.Context(), &grpc_health_v1.HealthCheckRequest{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if res.Status != grpc_health_v1.HealthCheckResponse_SERVING {
|
|
return fmt.Errorf("grpc health check status is '%v'", res.Status)
|
|
}
|
|
return nil
|
|
}
|
|
return nil
|
|
})
|
|
|
|
// Graceful shutdown code adapted from here: https://gist.github.com/embano1/e0bf49d24f1cdd07cffad93097c04f0a
|
|
sigCh := make(chan os.Signal, 1)
|
|
signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
|
|
wg := sync.WaitGroup{}
|
|
wg.Add(1)
|
|
go func() {
|
|
s := <-sigCh
|
|
log.Printf("got signal %v, attempting graceful shutdown", s)
|
|
grpc.GracefulStop()
|
|
wg.Done()
|
|
}()
|
|
|
|
log.Println("starting grpc server")
|
|
err = grpc.Serve(listener)
|
|
errors.CheckError(err)
|
|
wg.Wait()
|
|
log.Println("clean shutdown")
|
|
|
|
return nil
|
|
},
|
|
}
|
|
command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("ARGOCD_COMMIT_SERVER_LOGFORMAT", "text"), "Set the logging format. One of: text|json")
|
|
command.Flags().StringVar(&cmdutil.LogLevel, "loglevel", env.StringFromEnv("ARGOCD_COMMIT_SERVER_LOGLEVEL", "info"), "Set the logging level. One of: debug|info|warn|error")
|
|
command.Flags().StringVar(&listenHost, "address", env.StringFromEnv("ARGOCD_COMMIT_SERVER_LISTEN_ADDRESS", common.DefaultAddressCommitServer), "Listen on given address for incoming connections")
|
|
command.Flags().IntVar(&listenPort, "port", common.DefaultPortCommitServer, "Listen on given port for incoming connections")
|
|
command.Flags().StringVar(&metricsHost, "metrics-address", env.StringFromEnv("ARGOCD_COMMIT_SERVER_METRICS_LISTEN_ADDRESS", common.DefaultAddressCommitServerMetrics), "Listen on given address for metrics")
|
|
command.Flags().IntVar(&metricsPort, "metrics-port", common.DefaultPortCommitServerMetrics, "Start metrics server on given port")
|
|
|
|
return command
|
|
}
|