From ab8b85fc7ccea64bf879ee4bb916d8e988b0bf96 Mon Sep 17 00:00:00 2001 From: Ryota Sakamoto Date: Fri, 14 May 2021 00:42:26 +0900 Subject: [PATCH] feat: support dynamic ConfigMap name and Secret name Signed-off-by: Ryota Sakamoto --- cmd/controller.go | 7 +++++++ shared/k8s/informers.go | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/controller.go b/cmd/controller.go index f0c0a806..b3c44267 100644 --- a/cmd/controller.go +++ b/cmd/controller.go @@ -36,6 +36,8 @@ func newControllerCommand() *cobra.Command { logFormat string metricsPort int argocdRepoServer string + configMapName string + secretName string ) var command = cobra.Command{ Use: "controller", @@ -82,6 +84,9 @@ func newControllerCommand() *cobra.Command { } defer argocdService.Close() + k8s.ConfigMapName = configMapName + k8s.SecretName = secretName + registry := notificationscontroller.NewMetricsRegistry("argocd") http.Handle("/metrics", promhttp.HandlerFor(prometheus.Gatherers{registry, prometheus.DefaultGatherer}, promhttp.HandlerOpts{})) @@ -110,5 +115,7 @@ func newControllerCommand() *cobra.Command { command.Flags().StringVar(&logFormat, "logformat", "text", "Set the logging format. One of: text|json") command.Flags().IntVar(&metricsPort, "metrics-port", defaultMetricsPort, "Metrics port") command.Flags().StringVar(&argocdRepoServer, "argocd-repo-server", "argocd-repo-server:8081", "Argo CD repo server address") + command.Flags().StringVar(&configMapName, "config-map-name", "argocd-notifications-cm", "Set notifications ConfigMap name") + command.Flags().StringVar(&secretName, "secret-name", "argocd-notifications-secret", "Set notifications Secret name") return &command } diff --git a/shared/k8s/informers.go b/shared/k8s/informers.go index 5d24a207..26c6aba0 100644 --- a/shared/k8s/informers.go +++ b/shared/k8s/informers.go @@ -10,10 +10,12 @@ import ( "k8s.io/client-go/tools/cache" ) -const ( +var ( ConfigMapName = "argocd-notifications-cm" SecretName = "argocd-notifications-secret" +) +const ( settingsResyncDuration = 3 * time.Minute )