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]>
argoproj · Oct 11, 2024 · 40cdcf2 · 40cdcf2
1 parent 978b253
commit 40cdcf2
Show file tree

Hide file tree

Showing 60 changed files with 85,303 additions and 74 deletions.
diff --git a/Procfile b/Procfile
@@ -1,4 +1,4 @@
-controller: [ "$BIN_MODE" = 'true' ] && COMMAND=./dist/argocd || COMMAND='go run ./cmd/main.go' && sh -c "GOCOVERDIR=${ARGOCD_COVERAGE_DIR:-/tmp/coverage/app-controller} HOSTNAME=testappcontroller-1 FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-application-controller $COMMAND --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --otlp-address=${ARGOCD_OTLP_ADDRESS} --application-namespaces=${ARGOCD_APPLICATION_NAMESPACES:-''} --server-side-diff-enabled=${ARGOCD_APPLICATION_CONTROLLER_SERVER_SIDE_DIFF:-'false'}"
+controller: [ "$BIN_MODE" = 'true' ] && COMMAND=./dist/argocd || COMMAND='go run ./cmd/main.go' && sh -c "GOCOVERDIR=${ARGOCD_COVERAGE_DIR:-/tmp/coverage/app-controller} HOSTNAME=testappcontroller-1 FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-application-controller $COMMAND --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --commit-server localhost:${ARGOCD_E2E_COMMITSERVER_PORT:-8086} --otlp-address=${ARGOCD_OTLP_ADDRESS} --application-namespaces=${ARGOCD_APPLICATION_NAMESPACES:-''} --server-side-diff-enabled=${ARGOCD_APPLICATION_CONTROLLER_SERVER_SIDE_DIFF:-'false'}"
 api-server: [ "$BIN_MODE" = 'true' ] && COMMAND=./dist/argocd || COMMAND='go run ./cmd/main.go' && sh -c "GOCOVERDIR=${ARGOCD_COVERAGE_DIR:-/tmp/coverage/api-server} FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-server $COMMAND --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --disable-auth=${ARGOCD_E2E_DISABLE_AUTH:-'true'} --insecure --dex-server http://localhost:${ARGOCD_E2E_DEX_PORT:-5556} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --port ${ARGOCD_E2E_APISERVER_PORT:-8080} --otlp-address=${ARGOCD_OTLP_ADDRESS} --application-namespaces=${ARGOCD_APPLICATION_NAMESPACES:-''}"
 dex: sh -c "ARGOCD_BINARY_NAME=argocd-dex go run github.com/argoproj/argo-cd/v2/cmd gendexcfg -o `pwd`/dist/dex.yaml && (test -f dist/dex.yaml || { echo 'Failed to generate dex configuration'; exit 1; }) && docker run --rm -p ${ARGOCD_E2E_DEX_PORT:-5556}:${ARGOCD_E2E_DEX_PORT:-5556} -v `pwd`/dist/dex.yaml:/dex.yaml ghcr.io/dexidp/dex:$(grep "image: ghcr.io/dexidp/dex" manifests/base/dex/argocd-dex-server-deployment.yaml | cut -d':' -f3) dex serve /dex.yaml"
 redis: hack/start-redis-with-password.sh

diff --git a/cmd/argocd-application-controller/commands/argocd_application_controller.go b/cmd/argocd-application-controller/commands/argocd_application_controller.go
@@ -17,6 +17,7 @@ import (
  "k8s.io/client-go/tools/clientcmd"
 
  cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
+ commitclient "github.com/argoproj/argo-cd/v2/commitserver/apiclient"
  "github.com/argoproj/argo-cd/v2/common"
  "github.com/argoproj/argo-cd/v2/controller"
  "github.com/argoproj/argo-cd/v2/controller/sharding"
@@ -55,6 +56,7 @@ func NewCommand() *cobra.Command {
  repoErrorGracePeriod int64
  repoServerAddress string
  repoServerTimeoutSeconds int
+ commitServerAddress string
  selfHealTimeoutSeconds int
  statusProcessors int
  operationProcessors int
@@ -78,6 +80,7 @@ func NewCommand() *cobra.Command {
  enableDynamicClusterDistribution bool
  serverSideDiff bool
  ignoreNormalizerOpts normalizers.IgnoreNormalizerOpts
+ hydratorEnabled bool
  )
  command := cobra.Command{
  Use: cliName,
@@ -140,6 +143,8 @@ func NewCommand() *cobra.Command {
 
  repoClientset := apiclient.NewRepoServerClientset(repoServerAddress, repoServerTimeoutSeconds, tlsConfig)
 
+ commitClientset := commitclient.NewCommitServerClientset(commitServerAddress)
+
  cache, err := cacheSource()
  errors.CheckError(err)
  cache.Cache.SetClient(cacheutil.NewTwoLevelClient(cache.Cache.GetClient(), 10*time.Minute))
@@ -158,6 +163,7 @@ func NewCommand() *cobra.Command {
  kubeClient,
  appClient,
  repoClientset,
+ commitClientset,
  cache,
  kubectl,
  resyncDuration,
@@ -177,6 +183,7 @@ func NewCommand() *cobra.Command {
  serverSideDiff,
  enableDynamicClusterDistribution,
  ignoreNormalizerOpts,
+ hydratorEnabled,
  )
  errors.CheckError(err)
  cacheutil.CollectMetrics(redisClient, appController.GetMetricsServer())
@@ -219,6 +226,7 @@ func NewCommand() *cobra.Command {
  command.Flags().Int64Var(&repoErrorGracePeriod, "repo-error-grace-period-seconds", int64(env.ParseDurationFromEnv("ARGOCD_REPO_ERROR_GRACE_PERIOD_SECONDS", defaultAppResyncPeriod*time.Second, 0, math.MaxInt64).Seconds()), "Grace period in seconds for ignoring consecutive errors while communicating with repo server.")
  command.Flags().StringVar(&repoServerAddress, "repo-server", env.StringFromEnv("ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER", common.DefaultRepoServerAddr), "Repo server address.")
  command.Flags().IntVar(&repoServerTimeoutSeconds, "repo-server-timeout-seconds", env.ParseNumFromEnv("ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER_TIMEOUT_SECONDS", 60, 0, math.MaxInt64), "Repo server RPC call timeout seconds.")
+ command.Flags().StringVar(&commitServerAddress, "commit-server", env.StringFromEnv("ARGOCD_APPLICATION_CONTROLLER_COMMIT_SERVER", common.DefaultCommitServerAddr), "Commit server address.")
  command.Flags().IntVar(&statusProcessors, "status-processors", env.ParseNumFromEnv("ARGOCD_APPLICATION_CONTROLLER_STATUS_PROCESSORS", 20, 0, math.MaxInt32), "Number of application status processors")
  command.Flags().IntVar(&operationProcessors, "operation-processors", env.ParseNumFromEnv("ARGOCD_APPLICATION_CONTROLLER_OPERATION_PROCESSORS", 10, 0, math.MaxInt32), "Number of application operation processors")
  command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("ARGOCD_APPLICATION_CONTROLLER_LOGFORMAT", "text"), "Set the logging format. One of: text|json")
@@ -251,6 +259,7 @@ func NewCommand() *cobra.Command {
  command.Flags().BoolVar(&enableDynamicClusterDistribution, "dynamic-cluster-distribution-enabled", env.ParseBoolFromEnv(common.EnvEnableDynamicClusterDistribution, false), "Enables dynamic cluster distribution.")
  command.Flags().BoolVar(&serverSideDiff, "server-side-diff-enabled", env.ParseBoolFromEnv(common.EnvServerSideDiff, false), "Feature flag to enable ServerSide diff. Default (\"false\")")
  command.Flags().DurationVar(&ignoreNormalizerOpts.JQExecutionTimeout, "ignore-normalizer-jq-execution-timeout-seconds", env.ParseDurationFromEnv("ARGOCD_IGNORE_NORMALIZER_JQ_TIMEOUT", 0*time.Second, 0, math.MaxInt64), "Set ignore normalizer JQ execution timeout")
+ command.Flags().BoolVar(&hydratorEnabled, "hydrator-enabled", env.ParseBoolFromEnv("ARGOCD_HYDRATOR_ENABLED", false), "Feature flag to enable Hydrator. Default (\"false\")")
  cacheSource = appstatecache.AddCacheFlagsToCmd(&command, cacheutil.Options{
  OnClientCreated: func(client *redis.Client) {
  redisClient = client

diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
@@ -108,6 +108,7 @@ type watchOpts struct {
  suspended bool
  degraded bool
  delete bool
+ hydrated bool
 }
 
 // NewApplicationCreateCommand returns a new instance of an `argocd app create` command
@@ -1788,6 +1789,7 @@ func NewApplicationWaitCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
  command.Flags().BoolVar(&watch.suspended, "suspended", false, "Wait for suspended")
  command.Flags().BoolVar(&watch.degraded, "degraded", false, "Wait for degraded")
  command.Flags().BoolVar(&watch.delete, "delete", false, "Wait for delete")
+ command.Flags().BoolVar(&watch.hydrated, "hydrated", false, "Wait for hydration operations")
  command.Flags().StringVarP(&selector, "selector", "l", "", "Wait for apps by label. Supports '=', '==', '!=', in, notin, exists & not exists. Matching apps must satisfy all of the specified label constraints.")
  command.Flags().StringArrayVar(&resources, "resource", []string{}, fmt.Sprintf("Sync only specific resources as GROUP%[1]sKIND%[1]sNAME or %[2]sGROUP%[1]sKIND%[1]sNAME. Fields may be blank and '*' can be used. This option may be specified repeatedly", resourceFieldDelimiter, resourceExcludeIndicator))
  command.Flags().BoolVar(&watch.operation, "operation", false, "Wait for pending operations")
@@ -2324,7 +2326,7 @@ func groupResourceStates(app *argoappv1.Application, selectedResources []*argoap
 }
 
 // check if resource health, sync and operation statuses matches watch options
-func checkResourceStatus(watch watchOpts, healthStatus string, syncStatus string, operationStatus *argoappv1.Operation) bool {
+func checkResourceStatus(watch watchOpts, healthStatus string, syncStatus string, operationStatus *argoappv1.Operation, hydrationFinished bool) bool {
  if watch.delete {
  return false
  }
@@ -2354,7 +2356,8 @@ func checkResourceStatus(watch watchOpts, healthStatus string, syncStatus string
 
  synced := !watch.sync || syncStatus == string(argoappv1.SyncStatusCodeSynced)
  operational := !watch.operation || operationStatus == nil
- return synced && healthCheckPassed && operational
+ hydration := !watch.hydrated || hydrationFinished
+ return synced && healthCheckPassed && operational && hydration
 }
 
 // resourceParentChild gets the latest state of the app and the latest state of the app's resource tree and then
@@ -2518,21 +2521,23 @@ func waitOnApplicationStatus(ctx context.Context, acdClient argocdclient.Client,
  }
  }
 
+ hydrationFinished := app.Status.SourceHydrator.CurrentOperation != nil && app.Status.SourceHydrator.CurrentOperation.Phase == argoappv1.HydrateOperationPhaseHydrated && app.Status.SourceHydrator.CurrentOperation.SourceHydrator.DeepEquals(app.Status.SourceHydrator.LastSuccessfulOperation.SourceHydrator) && app.Status.SourceHydrator.CurrentOperation.DrySHA == app.Status.SourceHydrator.LastSuccessfulOperation.DrySHA
+
  var selectedResourcesAreReady bool
 
  // If selected resources are included, wait only on those resources, otherwise wait on the application as a whole.
  if len(selectedResources) > 0 {
  selectedResourcesAreReady = true
  for _, state := range getResourceStates(app, selectedResources) {
- resourceIsReady := checkResourceStatus(watch, state.Health, state.Status, appEvent.Application.Operation)
+ resourceIsReady := checkResourceStatus(watch, state.Health, state.Status, appEvent.Application.Operation, hydrationFinished)
  if !resourceIsReady {
  selectedResourcesAreReady = false
  break
  }
  }
  } else {
  // Wait on the application as a whole
- selectedResourcesAreReady = checkResourceStatus(watch, string(app.Status.Health.Status), string(app.Status.Sync.Status), appEvent.Application.Operation)
+ selectedResourcesAreReady = checkResourceStatus(watch, string(app.Status.Health.Status), string(app.Status.Sync.Status), appEvent.Application.Operation, hydrationFinished)
  }
 
  if selectedResourcesAreReady && (!operationInProgress || !watch.operation) {

diff --git a/cmd/argocd/commands/app_test.go b/cmd/argocd/commands/app_test.go
@@ -1762,81 +1762,81 @@ func TestCheckResourceStatus(t *testing.T) {
  suspended: true,
  health: true,
  degraded: true,
- }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Degraded, Suspended and health status failed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: true,
  health: true,
  degraded: true,
- }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.False(t, res)
  })
  t.Run("Suspended and health status passed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: true,
  health: true,
- }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Suspended and health status failed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: true,
  health: true,
- }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.False(t, res)
  })
  t.Run("Suspended passed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: true,
  health: false,
- }, string(health.HealthStatusSuspended), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusSuspended), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Suspended failed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: true,
  health: false,
- }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.False(t, res)
  })
  t.Run("Health passed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: false,
  health: true,
- }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusHealthy), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Health failed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: false,
  health: true,
- }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.False(t, res)
  })
  t.Run("Synced passed", func(t *testing.T) {
- res := checkResourceStatus(watchOpts{}, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ res := checkResourceStatus(watchOpts{}, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Synced failed", func(t *testing.T) {
- res := checkResourceStatus(watchOpts{}, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeOutOfSync), &v1alpha1.Operation{})
+ res := checkResourceStatus(watchOpts{}, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeOutOfSync), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Degraded passed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: false,
  health: false,
  degraded: true,
- }, string(health.HealthStatusDegraded), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusDegraded), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.True(t, res)
  })
  t.Run("Degraded failed", func(t *testing.T) {
  res := checkResourceStatus(watchOpts{
  suspended: false,
  health: false,
  degraded: true,
- }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{})
+ }, string(health.HealthStatusProgressing), string(v1alpha1.SyncStatusCodeSynced), &v1alpha1.Operation{}, true)
  assert.False(t, res)
  })
 }