manifests generation and naming fixes (#255)

codefresh-io · Nov 23, 2023 · 58d17d4 · 58d17d4
1 parent 90db562
commit 58d17d4
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 586 deletions.
diff --git a/cmd/event-reporter-server/commands/event_reporter_server.go b/cmd/event-reporter-server/commands/event_reporter_server.go
@@ -56,16 +56,12 @@ func NewCommand() *cobra.Command {
 		glogLevel                int
 		clientConfig             clientcmd.ClientConfig
 		repoServerTimeoutSeconds int
-		baseHRef                 string
-		rootPath                 string
 		repoServerAddress        string
 		applicationServerAddress string
-		disableAuth              bool
 		cacheSrc                 func() (*servercache.Cache, error)
 		contentSecurityPolicy    string
 		repoServerPlaintext      bool
 		repoServerStrictTLS      bool
-		staticAssetsDir          string
 		applicationNamespaces    []string
 		argocdToken              string
 	)
@@ -130,12 +126,6 @@ func NewCommand() *cobra.Command {
 			}
 
 			repoclientset := repoapiclient.NewRepoServerClientset(repoServerAddress, repoServerTimeoutSeconds, tlsConfig)
-			if rootPath != "" {
-				if baseHRef != "" && baseHRef != rootPath {
-					log.Warnf("--basehref and --rootpath had conflict: basehref: %s rootpath: %s", baseHRef, rootPath)
-				}
-				baseHRef = rootPath
-			}
 
 			applicationClientSet, err := apiclient.NewClient(&apiclient.ClientOptions{
 				ServerAddr: applicationServerAddress,
@@ -159,8 +149,6 @@ func NewCommand() *cobra.Command {
 				ListenPort:               listenPort,
 				ListenHost:               listenHost,
 				Namespace:                namespace,
-				BaseHRef:                 baseHRef,
-				RootPath:                 rootPath,
 				KubeClientset:            kubeclientset,
 				AppClientset:             appClientSet,
 				RepoClientset:            repoclientset,
@@ -189,27 +177,22 @@ func NewCommand() *cobra.Command {
 	}
 
 	clientConfig = cli.AddKubectlFlagsToCmd(command)
-	command.Flags().BoolVar(&insecure, "insecure", env.ParseBoolFromEnv("ARGOCD_SERVER_INSECURE", false), "Run server without TLS")
-	command.Flags().StringVar(&staticAssetsDir, "staticassets", env.StringFromEnv("ARGOCD_SERVER_STATIC_ASSETS", "/shared/app"), "Directory path that contains additional static assets")
-	command.Flags().StringVar(&baseHRef, "basehref", env.StringFromEnv("ARGOCD_SERVER_BASEHREF", "/"), "Value for base href in index.html. Used if Argo CD is running behind reverse proxy under subpath different from /")
-	command.Flags().StringVar(&rootPath, "rootpath", env.StringFromEnv("ARGOCD_SERVER_ROOTPATH", ""), "Used if Argo CD is running behind reverse proxy under subpath different from /")
-	command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("ARGOCD_SERVER_LOGFORMAT", "text"), "Set the logging format. One of: text|json")
-	command.Flags().StringVar(&cmdutil.LogLevel, "loglevel", env.StringFromEnv("ARGOCD_SERVER_LOG_LEVEL", "info"), "Set the logging level. One of: debug|info|warn|error")
+	command.Flags().BoolVar(&insecure, "insecure", env.ParseBoolFromEnv("EVENT_REPORTER_INSECURE", false), "Run server without TLS")
+	command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("EVENT_REPORTER_LOGFORMAT", "text"), "Set the logging format. One of: text|json")
+	command.Flags().StringVar(&cmdutil.LogLevel, "loglevel", env.StringFromEnv("EVENT_REPORTER_LOG_LEVEL", "info"), "Set the logging level. One of: debug|info|warn|error")
 	command.Flags().IntVar(&glogLevel, "gloglevel", 0, "Set the glog logging level")
-	command.Flags().StringVar(&applicationServerAddress, "application-server", env.StringFromEnv("ARGOCD_SERVER_APPLICATION_SERVER", common.DefaultApplicationServerAddr), "Application server address")
+	command.Flags().StringVar(&applicationServerAddress, "application-server", env.StringFromEnv("EVENT_REPORTER_APPLICATION_SERVER", common.DefaultApplicationServerAddr), "Application server address")
 	command.Flags().StringVar(&argocdToken, "argocd-token", env.StringFromEnv("ARGOCD_TOKEN", ""), "ArgoCD server JWT token")
-	command.Flags().StringVar(&repoServerAddress, "repo-server", env.StringFromEnv("ARGOCD_SERVER_REPO_SERVER", common.DefaultRepoServerAddr), "Repo server address")
-	command.Flags().BoolVar(&disableAuth, "disable-auth", env.ParseBoolFromEnv("ARGOCD_SERVER_DISABLE_AUTH", false), "Disable client authentication")
+	command.Flags().StringVar(&repoServerAddress, "repo-server", env.StringFromEnv("EVENT_REPORTER_REPO_SERVER", common.DefaultRepoServerAddr), "Repo server address")
 	command.AddCommand(cli.NewVersionCmd(cliName))
-	command.Flags().StringVar(&listenHost, "address", env.StringFromEnv("ARGOCD_SERVER_LISTEN_ADDRESS", common.DefaultAddressAPIServer), "Listen on given address")
-	command.Flags().IntVar(&listenPort, "port", common.DefaultPortAPIServer, "Listen on given port")
-	command.Flags().StringVar(&metricsHost, env.StringFromEnv("ARGOCD_SERVER_METRICS_LISTEN_ADDRESS", "metrics-address"), common.DefaultAddressAPIServerMetrics, "Listen for metrics on given address")
-	command.Flags().IntVar(&metricsPort, "metrics-port", common.DefaultPortArgoCDAPIServerMetrics, "Start metrics on given port")
-	command.Flags().IntVar(&repoServerTimeoutSeconds, "repo-server-timeout-seconds", env.ParseNumFromEnv("ARGOCD_SERVER_REPO_SERVER_TIMEOUT_SECONDS", 60, 0, math.MaxInt64), "Repo server RPC call timeout seconds.")
-	command.Flags().StringVar(&contentSecurityPolicy, "content-security-policy", env.StringFromEnv("ARGOCD_SERVER_CONTENT_SECURITY_POLICY", "frame-ancestors 'self';"), "Set Content-Security-Policy header in HTTP responses to `value`. To disable, set to \"\".")
-	command.Flags().BoolVar(&repoServerPlaintext, "repo-server-plaintext", env.ParseBoolFromEnv("ARGOCD_SERVER_REPO_SERVER_PLAINTEXT", false), "Use a plaintext client (non-TLS) to connect to repository server")
-	command.Flags().BoolVar(&repoServerStrictTLS, "repo-server-strict-tls", env.ParseBoolFromEnv("ARGOCD_SERVER_REPO_SERVER_STRICT_TLS", false), "Perform strict validation of TLS certificates when connecting to repo server")
-	command.Flags().StringSliceVar(&applicationNamespaces, "application-namespaces", env.StringsFromEnv("ARGOCD_APPLICATION_NAMESPACES", []string{}, ","), "List of additional namespaces where application resources can be managed in")
+	command.Flags().StringVar(&listenHost, "address", env.StringFromEnv("EVENT_REPORTER_LISTEN_ADDRESS", common.DefaultAddressEventReporterServer), "Listen on given address")
+	command.Flags().IntVar(&listenPort, "port", common.DefaultPortEventReporterServer, "Listen on given port")
+	command.Flags().StringVar(&metricsHost, env.StringFromEnv("EVENT_REPORTER_METRICS_LISTEN_ADDRESS", "metrics-address"), common.DefaultAddressEventReporterServerMetrics, "Listen for metrics on given address")
+	command.Flags().IntVar(&metricsPort, "metrics-port", common.DefaultPortEventReporterServerMetrics, "Start metrics on given port")
+	command.Flags().IntVar(&repoServerTimeoutSeconds, "repo-server-timeout-seconds", env.ParseNumFromEnv("EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS", 60, 0, math.MaxInt64), "Repo server RPC call timeout seconds.")
+	command.Flags().StringVar(&contentSecurityPolicy, "content-security-policy", env.StringFromEnv("EVENT_REPORTER_CONTENT_SECURITY_POLICY", "frame-ancestors 'self';"), "Set Content-Security-Policy header in HTTP responses to `value`. To disable, set to \"\".")
+	command.Flags().BoolVar(&repoServerPlaintext, "repo-server-plaintext", env.ParseBoolFromEnv("EVENT_REPORTER_REPO_SERVER_PLAINTEXT", false), "Use a plaintext client (non-TLS) to connect to repository server")
+	command.Flags().BoolVar(&repoServerStrictTLS, "repo-server-strict-tls", env.ParseBoolFromEnv("EVENT_REPORTER_REPO_SERVER_STRICT_TLS", false), "Perform strict validation of TLS certificates when connecting to repo server")
 	cacheSrc = servercache.AddCacheFlagsToCmd(command, func(client *redis.Client) {
 		redisClient = client
 	})

diff --git a/common/common.go b/common/common.go
@@ -45,20 +45,24 @@ const (
 
 // Default listener ports for ArgoCD components
 const (
-	DefaultPortAPIServer              = 8080
-	DefaultPortRepoServer             = 8081
-	DefaultPortArgoCDMetrics          = 8082
-	DefaultPortArgoCDAPIServerMetrics = 8083
-	DefaultPortRepoServerMetrics      = 8084
+	DefaultPortAPIServer                  = 8080
+	DefaultPortRepoServer                 = 8081
+	DefaultPortArgoCDMetrics              = 8082
+	DefaultPortArgoCDAPIServerMetrics     = 8083
+	DefaultPortRepoServerMetrics          = 8084
+	DefaultPortEventReporterServerMetrics = 8085
+	DefaultPortEventReporterServer        = 8088
 )
 
 // 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"
+	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"
 )
 
 // Default paths on the pod's file system

diff --git a/manifests/base/event-reporter/event-reporter-deployment.yaml b/manifests/base/event-reporter/event-reporter-deployment.yaml
@@ -23,209 +23,65 @@ spec:
         args:
           - /usr/local/bin/event-reporter-server
         env:
-        - name: ARGOCD_SERVER_INSECURE
+        - name: EVENT_REPORTER_INSECURE
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.insecure
+                key: event-reporter.insecure
                 optional: true
-        - name: ARGOCD_SERVER_BASEHREF
+        - name: EVENT_REPORTER_LOGFORMAT
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.basehref
+                key: event-reporter.log.format
                 optional: true
-        - name: ARGOCD_SERVER_ROOTPATH
+        - name: EVENT_REPORTER_LOG_LEVEL
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.rootpath
+                key: event-reporter.log.level
                 optional: true
-        - name: ARGOCD_SERVER_LOGFORMAT
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.log.format
-                optional: true
-        - name: ARGOCD_SERVER_LOG_LEVEL
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.log.level
-                optional: true
-        - name: ARGOCD_SERVER_REPO_SERVER
+        - name: EVENT_REPORTER_REPO_SERVER
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
                 key: repo.server
                 optional: true
-        - name: ARGOCD_SERVER_DEX_SERVER
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.dex.server
-                optional: true
-        - name: ARGOCD_SERVER_DISABLE_AUTH
+        - name: EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.disable.auth
+                key: event-reporter.repo.server.timeout.seconds
                 optional: true
-        - name: ARGOCD_SERVER_ENABLE_GZIP
+        - name: EVENT_REPORTER_REPO_SERVER_PLAINTEXT
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.enable.gzip
-                optional: true
-        - name: ARGOCD_SERVER_REPO_SERVER_TIMEOUT_SECONDS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.repo.server.timeout.seconds
-                optional: true
-        - name: ARGOCD_SERVER_X_FRAME_OPTIONS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.x.frame.options
-                optional: true
-        - name: ARGOCD_SERVER_CONTENT_SECURITY_POLICY
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.content.security.policy
-                optional: true
-        - name: ARGOCD_SERVER_REPO_SERVER_PLAINTEXT
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.repo.server.plaintext
-                optional: true
-        - name: ARGOCD_SERVER_REPO_SERVER_STRICT_TLS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.repo.server.strict.tls
-                optional: true
-        - name: ARGOCD_SERVER_DEX_SERVER_PLAINTEXT
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.dex.server.plaintext
-                optional: true
-        - name: ARGOCD_SERVER_DEX_SERVER_STRICT_TLS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.dex.server.strict.tls
-                optional: true
-        - name: ARGOCD_TLS_MIN_VERSION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.tls.minversion
-                optional: true
-        - name: ARGOCD_TLS_MAX_VERSION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.tls.maxversion
-                optional: true
-        - name: ARGOCD_TLS_CIPHERS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.tls.ciphers
-                optional: true
-        - name: ARGOCD_SERVER_CONNECTION_STATUS_CACHE_EXPIRATION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.connection.status.cache.expiration
-                optional: true
-        - name: ARGOCD_SERVER_OIDC_CACHE_EXPIRATION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.oidc.cache.expiration
-                optional: true
-        - name: ARGOCD_SERVER_LOGIN_ATTEMPTS_EXPIRATION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.login.attempts.expiration
-                optional: true
-        - name: ARGOCD_SERVER_STATIC_ASSETS
-          valueFrom:
-            configMapKeyRef:
-              name: argocd-cmd-params-cm
-              key: server.staticassets
-              optional: true
-        - name: ARGOCD_APP_STATE_CACHE_EXPIRATION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.app.state.cache.expiration
+                key: event-reporter.repo.server.plaintext
                 optional: true
         - name: REDIS_SERVER
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
                 key: redis.server
                 optional: true
-        - name: REDIS_COMPRESSION
-          valueFrom:
-            configMapKeyRef:
-              name: argocd-cmd-params-cm
-              key: redis.compression
-              optional: true
         - name: REDISDB
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
                 key: redis.db
                 optional: true
-        - name: ARGOCD_DEFAULT_CACHE_EXPIRATION
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.default.cache.expiration
-                optional: true
-        - name: ARGOCD_MAX_COOKIE_NUMBER
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.http.cookie.maxnumber
-                optional: true
-        - name: ARGOCD_SERVER_LISTEN_ADDRESS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.listen.address
-                optional: true
-        - name: ARGOCD_SERVER_METRICS_LISTEN_ADDRESS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: server.metrics.listen.address
-                optional: true
-        - name: ARGOCD_SERVER_OTLP_ADDRESS
-          valueFrom:
-              configMapKeyRef:
-                name: argocd-cmd-params-cm
-                key: otlp.address
-                optional: true
-        - name: ARGOCD_APPLICATION_NAMESPACES
+        - name: EVENT_REPORTER_LISTEN_ADDRESS
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: application.namespaces
+                key: event-reporter.listen.address
                 optional: true
-        - name: ARGOCD_SERVER_ENABLE_PROXY_EXTENSION
+        - name: EVENT_REPORTER_METRICS_LISTEN_ADDRESS
           valueFrom:
               configMapKeyRef:
                 name: argocd-cmd-params-cm
-                key: server.enable.proxy.extension
+                key: event-reporter.metrics.listen.address
                 optional: true
         volumeMounts:
         - name: ssh-known-hosts
@@ -234,15 +90,11 @@ spec:
           mountPath: /app/config/tls
         - name: argocd-repo-server-tls
           mountPath: /app/config/server/tls
-        - name: argocd-dex-server-tls
-          mountPath: /app/config/dex/tls
-        - mountPath: /home/argocd
-          name: plugins-home
         - mountPath: /tmp
           name: tmp
         ports:
-        - containerPort: 8080
-        - containerPort: 8083
+        - containerPort: 8088
+        - containerPort: 8085
         livenessProbe:
           httpGet:
             path: /healthz?full=true
@@ -270,12 +122,6 @@ spec:
         name: plugins-home
       - emptyDir: {}
         name: tmp
-      - name: ssh-known-hosts
-        configMap:
-          name: argocd-ssh-known-hosts-cm
-      - name: tls-certs
-        configMap:
-          name: argocd-tls-certs-cm
       - name: argocd-repo-server-tls
         secret:
           secretName: argocd-repo-server-tls
@@ -287,15 +133,6 @@ spec:
             path: tls.key
           - key: ca.crt
             path: ca.crt
-      - name: argocd-dex-server-tls
-        secret:
-          secretName: argocd-dex-server-tls
-          optional: true
-          items:
-          - key: tls.crt
-            path: tls.crt
-          - key: ca.crt
-            path: ca.crt
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution: