acr controller

Makefile

@@ -125,6 +125,7 @@ define run-in-test-client
 		-e GITHUB_TOKEN \
 		-e GOCACHE=/tmp/go-build-cache \
 		-e ARGOCD_LINT_GOGC=$(ARGOCD_LINT_GOGC) \
+		-e GOSUMDB=off \
 		-v ${DOCKER_SRC_MOUNT} \
 		-v ${GOPATH}/pkg/mod:/go/pkg/mod${VOLUME_MOUNT} \
 		-v ${GOCACHE}:/tmp/go-build-cache${VOLUME_MOUNT} \
@@ -231,7 +232,7 @@ clidocsgen:
 
 
 .PHONY: codegen-local
-codegen-local: mod-vendor-local gogen protogen clientgen openapigen clidocsgen manifests-local
+codegen-local: mod-vendor-local protogen clientgen openapigen clidocsgen manifests-local
 	rm -rf vendor/
 
 .PHONY: codegen-local-fast

acr_controller/application/client.go

@@ -5,12 +5,13 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	appclient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	"google.golang.org/grpc"
 	"io"
 	"net/http"
 	"strings"
 	"time"
+
+	appclient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
+	"google.golang.org/grpc"
 )
 
 //go:generate go run github.com/vektra/mockery/[email protected] --name=ApplicationClient

acr_controller/controller/broadcaster.go

@@ -24,7 +24,7 @@ func (s *subscriber) matches(event *appv1.ApplicationWatchEvent) bool {
 // Broadcaster is an interface for broadcasting application informer watch events to multiple subscribers.
 type Broadcaster interface {
 	Subscribe(ch chan *appv1.ApplicationWatchEvent, filters ...func(event *appv1.ApplicationWatchEvent) bool) func()
-	OnAdd(interface{})
+	OnAdd(interface{}, bool)
 	OnUpdate(interface{}, interface{})
 	OnDelete(interface{})
 }
@@ -86,7 +86,7 @@ func (b *broadcasterHandler) Subscribe(ch chan *appv1.ApplicationWatchEvent, fil
 	}
 }
 
-func (b *broadcasterHandler) OnAdd(obj interface{}) {
+func (b *broadcasterHandler) OnAdd(obj interface{}, isInInitialList bool) {
 	if app, ok := obj.(*appv1.Application); ok {
 		b.notify(&appv1.ApplicationWatchEvent{Application: *app, Type: watch.Added})
 	}

acr_controller/server.go

@@ -5,7 +5,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	appclient "github.com/argoproj/argo-cd/v2/acr_controller/application"
-	application_change_revision_controller "github.com/argoproj/argo-cd/v2/acr_controller/controller"
+	acr_controller "github.com/argoproj/argo-cd/v2/acr_controller/controller"
 	"github.com/argoproj/argo-cd/v2/event_reporter/reporter"
 	"net"
 	"net/http"
@@ -57,8 +57,7 @@ type ACRServer struct {
 	featureManager *reporter.FeatureManager
 }
 
-type ACRServerSet struct {
-}
+type ACRServerSet struct{}
 
 type ACRServerOpts struct {
 	ListenPort               int
@@ -123,7 +122,7 @@ func (a *ACRServer) Init(ctx context.Context) {
 }
 
 func (a *ACRServer) RunController(ctx context.Context) {
-	controller := application_change_revision_controller.NewApplicationChangeRevisionController(a.appInformer, a.Cache, a.settingsMgr, a.ApplicationServiceClient, a.appLister, a.applicationClientset)
+	controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.Cache, a.settingsMgr, a.ApplicationServiceClient, a.appLister, a.applicationClientset)
 	go controller.Run(ctx)
 }
 
@@ -182,7 +181,7 @@ func (a *ACRServer) Listen() (*Listeners, error) {
 // k8s.io/ go-to-protobuf uses protoc-gen-gogo, which comes from gogo/protobuf (a fork of
 // golang/protobuf).
 func (a *ACRServer) Run(ctx context.Context, lns *Listeners) {
-	var httpS = a.newHTTPServer(ctx, a.ListenPort)
+	httpS := a.newHTTPServer(ctx, a.ListenPort)
 	tlsConfig := tls.Config{}
 	tlsConfig.GetCertificate = func(info *tls.ClientHelloInfo) (*tls.Certificate, error) {
 		return a.settings.Certificate, nil

cmd/application-change-revision-controller/commands/application_change_revision_controller.go

@@ -3,18 +3,20 @@ package commands
 import (
 	"context"
 	"fmt"
+	"time"
+
 	acr "github.com/argoproj/argo-cd/v2/acr_controller"
 	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	"time"
 
-	appclient "github.com/argoproj/argo-cd/v2/acr_controller/application"
 	"github.com/argoproj/pkg/stats"
 	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
+	appclient "github.com/argoproj/argo-cd/v2/acr_controller/application"
+
 	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
 	"github.com/argoproj/argo-cd/v2/common"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -60,7 +62,7 @@ func NewCommand() *cobra.Command {
 		argocdToken              string
 		rootpath                 string
 	)
-	var command = &cobra.Command{
+	command := &cobra.Command{
 		Use:               cliName,
 		Short:             "Run the Change Revision Controller server",
 		Long:              "The Change Revision Controller is a service that listens for application events and updates the application's revision in the application CRD",

hack/update-openapi.sh

@@ -30,5 +30,5 @@ openapi-gen \
 [ -L ./v2 ] && rm -rf v2
 
 export GO111MODULE=on
-go build -o ./dist/gen-crd-spec "${PROJECT_ROOT}/hack/gen-crd-spec"
+go build -o -buildvcs=false ./dist/gen-crd-spec "${PROJECT_ROOT}/hack/gen-crd-spec"
 ./dist/gen-crd-spec