From 58d17d4ba0e9711697628bcb0c749088a69ac5ed Mon Sep 17 00:00:00 2001 From: pasha-codefresh Date: Thu, 23 Nov 2023 22:00:43 +0200 Subject: [PATCH] manifests generation and naming fixes (#255) --- .../commands/event_reporter_server.go | 43 ++-- common/common.go | 24 ++- .../event-reporter-deployment.yaml | 197 ++--------------- manifests/install.yaml | 203 ++---------------- manifests/namespace-install.yaml | 203 ++---------------- 5 files changed, 84 insertions(+), 586 deletions(-) diff --git a/cmd/event-reporter-server/commands/event_reporter_server.go b/cmd/event-reporter-server/commands/event_reporter_server.go index 8bfdb82f74bce..f73cbbfb4780a 100644 --- 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 index 740d955670fbb..aacea37ee997a 100644 --- 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 index 309b9051b58fa..71ad26ef17146 100644 --- a/manifests/base/event-reporter/event-reporter-deployment.yaml +++ b/manifests/base/event-reporter/event-reporter-deployment.yaml @@ -23,149 +23,41 @@ 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: @@ -173,59 +65,23 @@ spec: 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: diff --git a/manifests/install.yaml b/manifests/install.yaml index 5b5c4c824c480..8603aa15412bb 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -20474,151 +20474,43 @@ spec: topologyKey: kubernetes.io/hostname weight: 5 containers: - - command: - - event-reporter-server + - args: + - /usr/local/bin/event-reporter-server env: - - name: ARGOCD_SERVER_INSECURE + - name: EVENT_REPORTER_INSECURE valueFrom: configMapKeyRef: - key: server.insecure + key: event-reporter.insecure name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_BASEHREF + - name: EVENT_REPORTER_LOGFORMAT valueFrom: configMapKeyRef: - key: server.basehref + key: event-reporter.log.format name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_ROOTPATH + - name: EVENT_REPORTER_LOG_LEVEL valueFrom: configMapKeyRef: - key: server.rootpath + key: event-reporter.log.level name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_LOGFORMAT - valueFrom: - configMapKeyRef: - key: server.log.format - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_LOG_LEVEL - valueFrom: - configMapKeyRef: - key: server.log.level - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER + - name: EVENT_REPORTER_REPO_SERVER valueFrom: configMapKeyRef: key: repo.server name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_DEX_SERVER - valueFrom: - configMapKeyRef: - key: server.dex.server - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DISABLE_AUTH - valueFrom: - configMapKeyRef: - key: server.disable.auth - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_ENABLE_GZIP - valueFrom: - configMapKeyRef: - key: server.enable.gzip - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_TIMEOUT_SECONDS - valueFrom: - configMapKeyRef: - key: server.repo.server.timeout.seconds - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_X_FRAME_OPTIONS - valueFrom: - configMapKeyRef: - key: server.x.frame.options - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_CONTENT_SECURITY_POLICY - valueFrom: - configMapKeyRef: - key: server.content.security.policy - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_PLAINTEXT - valueFrom: - configMapKeyRef: - key: server.repo.server.plaintext - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_STRICT_TLS - valueFrom: - configMapKeyRef: - key: server.repo.server.strict.tls - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DEX_SERVER_PLAINTEXT - valueFrom: - configMapKeyRef: - key: server.dex.server.plaintext - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DEX_SERVER_STRICT_TLS + - name: EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS valueFrom: configMapKeyRef: - key: server.dex.server.strict.tls + key: event-reporter.repo.server.timeout.seconds name: argocd-cmd-params-cm optional: true - - name: ARGOCD_TLS_MIN_VERSION + - name: EVENT_REPORTER_REPO_SERVER_PLAINTEXT valueFrom: configMapKeyRef: - key: server.tls.minversion - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_TLS_MAX_VERSION - valueFrom: - configMapKeyRef: - key: server.tls.maxversion - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_TLS_CIPHERS - valueFrom: - configMapKeyRef: - key: server.tls.ciphers - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_CONNECTION_STATUS_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.connection.status.cache.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_OIDC_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.oidc.cache.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_LOGIN_ATTEMPTS_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.login.attempts.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_STATIC_ASSETS - valueFrom: - configMapKeyRef: - key: server.staticassets - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_APP_STATE_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.app.state.cache.expiration + key: event-reporter.repo.server.plaintext name: argocd-cmd-params-cm optional: true - name: REDIS_SERVER @@ -20627,61 +20519,25 @@ spec: key: redis.server name: argocd-cmd-params-cm optional: true - - name: REDIS_COMPRESSION - valueFrom: - configMapKeyRef: - key: redis.compression - name: argocd-cmd-params-cm - optional: true - name: REDISDB valueFrom: configMapKeyRef: key: redis.db name: argocd-cmd-params-cm optional: true - - name: ARGOCD_DEFAULT_CACHE_EXPIRATION + - name: EVENT_REPORTER_LISTEN_ADDRESS valueFrom: configMapKeyRef: - key: server.default.cache.expiration + key: event-reporter.listen.address name: argocd-cmd-params-cm optional: true - - name: ARGOCD_MAX_COOKIE_NUMBER + - name: EVENT_REPORTER_METRICS_LISTEN_ADDRESS valueFrom: configMapKeyRef: - key: server.http.cookie.maxnumber + key: event-reporter.metrics.listen.address name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - key: server.listen.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_METRICS_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - key: server.metrics.listen.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_OTLP_ADDRESS - valueFrom: - configMapKeyRef: - key: otlp.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_APPLICATION_NAMESPACES - valueFrom: - configMapKeyRef: - key: application.namespaces - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_ENABLE_PROXY_EXTENSION - valueFrom: - configMapKeyRef: - key: server.enable.proxy.extension - name: argocd-cmd-params-cm - optional: true - image: quay.io/codefresh/argocd:latest + image: docker.io/xeonalex/personal-argocd-dev:reporter-v2 imagePullPolicy: Always livenessProbe: httpGet: @@ -20692,8 +20548,8 @@ spec: timeoutSeconds: 5 name: argocd-server ports: - - containerPort: 8080 - - containerPort: 8083 + - containerPort: 8088 + - containerPort: 8085 readinessProbe: httpGet: path: /healthz @@ -20716,10 +20572,6 @@ spec: name: tls-certs - mountPath: /app/config/server/tls name: argocd-repo-server-tls - - mountPath: /app/config/dex/tls - name: argocd-dex-server-tls - - mountPath: /home/argocd - name: plugins-home - mountPath: /tmp name: tmp serviceAccountName: event-reporter @@ -20728,12 +20580,6 @@ spec: name: plugins-home - emptyDir: {} name: tmp - - configMap: - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - name: argocd-tls-certs-cm - name: tls-certs - name: argocd-repo-server-tls secret: items: @@ -20745,15 +20591,6 @@ spec: path: ca.crt optional: true secretName: argocd-repo-server-tls - - name: argocd-dex-server-tls - secret: - items: - - key: tls.crt - path: tls.crt - - key: ca.crt - path: ca.crt - optional: true - secretName: argocd-dex-server-tls --- apiVersion: apps/v1 kind: StatefulSet diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index 97de01dde27ea..0d1cfcde43861 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -1575,151 +1575,43 @@ spec: topologyKey: kubernetes.io/hostname weight: 5 containers: - - command: - - event-reporter-server + - args: + - /usr/local/bin/event-reporter-server env: - - name: ARGOCD_SERVER_INSECURE + - name: EVENT_REPORTER_INSECURE valueFrom: configMapKeyRef: - key: server.insecure + key: event-reporter.insecure name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_BASEHREF + - name: EVENT_REPORTER_LOGFORMAT valueFrom: configMapKeyRef: - key: server.basehref + key: event-reporter.log.format name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_ROOTPATH + - name: EVENT_REPORTER_LOG_LEVEL valueFrom: configMapKeyRef: - key: server.rootpath + key: event-reporter.log.level name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_LOGFORMAT - valueFrom: - configMapKeyRef: - key: server.log.format - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_LOG_LEVEL - valueFrom: - configMapKeyRef: - key: server.log.level - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER + - name: EVENT_REPORTER_REPO_SERVER valueFrom: configMapKeyRef: key: repo.server name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_DEX_SERVER - valueFrom: - configMapKeyRef: - key: server.dex.server - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DISABLE_AUTH - valueFrom: - configMapKeyRef: - key: server.disable.auth - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_ENABLE_GZIP - valueFrom: - configMapKeyRef: - key: server.enable.gzip - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_TIMEOUT_SECONDS - valueFrom: - configMapKeyRef: - key: server.repo.server.timeout.seconds - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_X_FRAME_OPTIONS - valueFrom: - configMapKeyRef: - key: server.x.frame.options - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_CONTENT_SECURITY_POLICY - valueFrom: - configMapKeyRef: - key: server.content.security.policy - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_PLAINTEXT - valueFrom: - configMapKeyRef: - key: server.repo.server.plaintext - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_REPO_SERVER_STRICT_TLS - valueFrom: - configMapKeyRef: - key: server.repo.server.strict.tls - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DEX_SERVER_PLAINTEXT - valueFrom: - configMapKeyRef: - key: server.dex.server.plaintext - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_DEX_SERVER_STRICT_TLS + - name: EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS valueFrom: configMapKeyRef: - key: server.dex.server.strict.tls + key: event-reporter.repo.server.timeout.seconds name: argocd-cmd-params-cm optional: true - - name: ARGOCD_TLS_MIN_VERSION + - name: EVENT_REPORTER_REPO_SERVER_PLAINTEXT valueFrom: configMapKeyRef: - key: server.tls.minversion - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_TLS_MAX_VERSION - valueFrom: - configMapKeyRef: - key: server.tls.maxversion - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_TLS_CIPHERS - valueFrom: - configMapKeyRef: - key: server.tls.ciphers - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_CONNECTION_STATUS_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.connection.status.cache.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_OIDC_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.oidc.cache.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_LOGIN_ATTEMPTS_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.login.attempts.expiration - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_STATIC_ASSETS - valueFrom: - configMapKeyRef: - key: server.staticassets - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_APP_STATE_CACHE_EXPIRATION - valueFrom: - configMapKeyRef: - key: server.app.state.cache.expiration + key: event-reporter.repo.server.plaintext name: argocd-cmd-params-cm optional: true - name: REDIS_SERVER @@ -1728,61 +1620,25 @@ spec: key: redis.server name: argocd-cmd-params-cm optional: true - - name: REDIS_COMPRESSION - valueFrom: - configMapKeyRef: - key: redis.compression - name: argocd-cmd-params-cm - optional: true - name: REDISDB valueFrom: configMapKeyRef: key: redis.db name: argocd-cmd-params-cm optional: true - - name: ARGOCD_DEFAULT_CACHE_EXPIRATION + - name: EVENT_REPORTER_LISTEN_ADDRESS valueFrom: configMapKeyRef: - key: server.default.cache.expiration + key: event-reporter.listen.address name: argocd-cmd-params-cm optional: true - - name: ARGOCD_MAX_COOKIE_NUMBER + - name: EVENT_REPORTER_METRICS_LISTEN_ADDRESS valueFrom: configMapKeyRef: - key: server.http.cookie.maxnumber + key: event-reporter.metrics.listen.address name: argocd-cmd-params-cm optional: true - - name: ARGOCD_SERVER_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - key: server.listen.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_METRICS_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - key: server.metrics.listen.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_OTLP_ADDRESS - valueFrom: - configMapKeyRef: - key: otlp.address - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_APPLICATION_NAMESPACES - valueFrom: - configMapKeyRef: - key: application.namespaces - name: argocd-cmd-params-cm - optional: true - - name: ARGOCD_SERVER_ENABLE_PROXY_EXTENSION - valueFrom: - configMapKeyRef: - key: server.enable.proxy.extension - name: argocd-cmd-params-cm - optional: true - image: quay.io/codefresh/argocd:latest + image: docker.io/xeonalex/personal-argocd-dev:reporter-v2 imagePullPolicy: Always livenessProbe: httpGet: @@ -1793,8 +1649,8 @@ spec: timeoutSeconds: 5 name: argocd-server ports: - - containerPort: 8080 - - containerPort: 8083 + - containerPort: 8088 + - containerPort: 8085 readinessProbe: httpGet: path: /healthz @@ -1817,10 +1673,6 @@ spec: name: tls-certs - mountPath: /app/config/server/tls name: argocd-repo-server-tls - - mountPath: /app/config/dex/tls - name: argocd-dex-server-tls - - mountPath: /home/argocd - name: plugins-home - mountPath: /tmp name: tmp serviceAccountName: event-reporter @@ -1829,12 +1681,6 @@ spec: name: plugins-home - emptyDir: {} name: tmp - - configMap: - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - name: argocd-tls-certs-cm - name: tls-certs - name: argocd-repo-server-tls secret: items: @@ -1846,15 +1692,6 @@ spec: path: ca.crt optional: true secretName: argocd-repo-server-tls - - name: argocd-dex-server-tls - secret: - items: - - key: tls.crt - path: tls.crt - - key: ca.crt - path: ca.crt - optional: true - secretName: argocd-dex-server-tls --- apiVersion: apps/v1 kind: StatefulSet