Skip to content

Commit

Permalink
Revert "feat: support new reporting component (#265)"
Browse files Browse the repository at this point in the history
This reverts commit e1c2b03.
  • Loading branch information
pasha-codefresh committed Nov 28, 2023
1 parent 167d924 commit 3514011
Show file tree
Hide file tree
Showing 30 changed files with 12 additions and 3,761 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ COPY --from=argocd-build /go/src/github.com/argoproj/argo-cd/dist/argocd* /usr/l
USER root
RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-server && \
ln -s /usr/local/bin/argocd /usr/local/bin/argocd-repo-server && \
ln -s /usr/local/bin/argocd /usr/local/bin/event-reporter-server && \
ln -s /usr/local/bin/argocd /usr/local/bin/argocd-cmp-server && \
ln -s /usr/local/bin/argocd /usr/local/bin/argocd-application-controller && \
ln -s /usr/local/bin/argocd /usr/local/bin/argocd-dex && \
Expand Down
6 changes: 0 additions & 6 deletions cmd/event-reporter-server/commands/common.go

This file was deleted.

213 changes: 0 additions & 213 deletions cmd/event-reporter-server/commands/event_reporter_server.go

This file was deleted.

3 changes: 0 additions & 3 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
reposerver "github.com/argoproj/argo-cd/v2/cmd/argocd-repo-server/commands"
apiserver "github.com/argoproj/argo-cd/v2/cmd/argocd-server/commands"
cli "github.com/argoproj/argo-cd/v2/cmd/argocd/commands"
eventreporterserver "github.com/argoproj/argo-cd/v2/cmd/event-reporter-server/commands"
)

const (
Expand All @@ -35,8 +34,6 @@ func main() {
command = cli.NewCommand()
case "argocd-server":
command = apiserver.NewCommand()
case "event-reporter-server":
command = eventreporterserver.NewCommand()
case "argocd-application-controller":
command = appcontroller.NewCommand()
case "argocd-repo-server":
Expand Down
39 changes: 11 additions & 28 deletions common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import (
// Default service addresses and URLS of Argo CD internal services
const (
// DefaultRepoServerAddr is the gRPC address of the Argo CD repo server
DefaultRepoServerAddr = "argocd-repo-server:8081"
DefaultApplicationServerAddr = "argo-cd-server:80"
DefaultRepoServerAddr = "argocd-repo-server:8081"
// DefaultDexServerAddr is the HTTP address of the Dex OIDC server, which we run a reverse proxy against
DefaultDexServerAddr = "argocd-dex-server:5556"
// DefaultRedisAddr is the default redis address
Expand Down Expand Up @@ -45,24 +44,20 @@ const (

// Default listener ports for ArgoCD components
const (
DefaultPortAPIServer = 8080
DefaultPortRepoServer = 8081
DefaultPortArgoCDMetrics = 8082
DefaultPortArgoCDAPIServerMetrics = 8083
DefaultPortRepoServerMetrics = 8084
DefaultPortEventReporterServerMetrics = 8087
DefaultPortEventReporterServer = 8088
DefaultPortAPIServer = 8080
DefaultPortRepoServer = 8081
DefaultPortArgoCDMetrics = 8082
DefaultPortArgoCDAPIServerMetrics = 8083
DefaultPortRepoServerMetrics = 8084
)

// DefaultAddressAPIServer for ArgoCD components
const (
DefaultAddressAdminDashboard = "localhost"
DefaultAddressAPIServer = "0.0.0.0"
DefaultAddressAPIServerMetrics = "0.0.0.0"
DefaultAddressRepoServer = "0.0.0.0"
DefaultAddressRepoServerMetrics = "0.0.0.0"
DefaultAddressEventReporterServer = "0.0.0.0"
DefaultAddressEventReporterServerMetrics = "0.0.0.0"
DefaultAddressAdminDashboard = "localhost"
DefaultAddressAPIServer = "0.0.0.0"
DefaultAddressAPIServerMetrics = "0.0.0.0"
DefaultAddressRepoServer = "0.0.0.0"
DefaultAddressRepoServerMetrics = "0.0.0.0"
)

// Default paths on the pod's file system
Expand Down Expand Up @@ -242,12 +237,6 @@ const (
EnvCMPWorkDir = "ARGOCD_CMP_WORKDIR"
// EnvGPGDataPath overrides the location where GPG keyring for signature verification is stored
EnvGPGDataPath = "ARGOCD_GPG_DATA_PATH"
// EnvEventReporterShardingAlgorithm is the distribution sharding algorithm to be used: legacy
EnvEventReporterShardingAlgorithm = "EVENT_REPORTER_SHARDING_ALGORITHM"
// EnvEventReporterReplicas is the number of EventReporter replicas
EnvEventReporterReplicas = "EVENT_REPORTER_REPLICAS"
// EnvEventReporterShard is the shard number that should be handled by reporter
EnvEventReporterShard = "EVENT_REPORTER_SHARD"
)

// Config Management Plugin related constants
Expand Down Expand Up @@ -356,9 +345,3 @@ const TokenVerificationError = "failed to verify the token"
var TokenVerificationErr = errors.New(TokenVerificationError)

var PermissionDeniedAPIError = status.Error(codes.PermissionDenied, "permission denied")

// Event reporter constants
const (
EventReporterLegacyShardingAlgorithm = "legacy"
DefaultEventReporterShardingAlgorithm = EventReporterLegacyShardingAlgorithm
)
78 changes: 0 additions & 78 deletions event_reporter/codefresh/client.go

This file was deleted.

Loading

0 comments on commit 3514011

Please sign in to comment.