Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: acr v1.1 #334

Merged
merged 2 commits into from
Sep 18, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
acr v1.1
  • Loading branch information
pasha-codefresh committed Sep 18, 2024
commit 172adaa1237dc87c674f0508df8c5be1fcde5e39
5 changes: 0 additions & 5 deletions acr_controller/server.go
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ import (
"strings"
"time"

"github.com/argoproj/argo-cd/v2/event_reporter/handlers"
appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions"
applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
@@ -141,10 +140,6 @@ func (a *ACRServer) newHTTPServer(ctx context.Context, port int) *http.Server {
}

healthz.ServeHealthCheck(mux, a.healthCheck)

rH := handlers.GetRequestHandlers(a.ApplicationServiceClient)
mux.HandleFunc("/app-distribution", rH.GetAppDistribution)

return &httpS
}

Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ func NewCommand() *cobra.Command {
command.Flags().StringVar(&argocdToken, "argocd-token", env.StringFromEnv("ARGOCD_TOKEN", ""), "ArgoCD server JWT token")
command.AddCommand(cli.NewVersionCmd(cliName))
command.Flags().StringVar(&listenHost, "address", env.StringFromEnv("ACR_CONTROLLER_LISTEN_ADDRESS", common.DefaultAddressACRController), "Listen on given address")
command.Flags().IntVar(&listenPort, "port", common.DefaultPortCRCServer, "Listen on given port")
command.Flags().IntVar(&listenPort, "port", common.DefaultPortACRServer, "Listen on given port")
command.Flags().StringVar(&contentSecurityPolicy, "content-security-policy", env.StringFromEnv("ACR_CONTROLLER_CONTENT_SECURITY_POLICY", "frame-ancestors 'self';"), "Set Content-Security-Policy header in HTTP responses to `value`. To disable, set to \"\".")
command.Flags().StringSliceVar(&applicationNamespaces, "application-namespaces", env.StringsFromEnv("ARGOCD_APPLICATION_NAMESPACES", []string{}, ","), "List of additional namespaces where application resources can be managed in")
cacheSrc = servercache.AddCacheFlagsToCmd(command, cacheutil.Options{
2 changes: 1 addition & 1 deletion common/common.go
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ const (
DefaultPortEventReporterServerMetrics = 8087
DefaultPortEventReporterServer = 8088

DefaultPortACRServer = 8090
DefaultPortACRServer = 8090
)

// DefaultAddressAPIServer for ArgoCD components
Loading