mirror of
https://github.com/prometheus-operator/prometheus-operator.git
synced 2025-04-15 16:56:24 +00:00
Make localhost for local pods configurable via operator flag.
This commit is contained in:
parent
dcca9727a3
commit
141f39a1c9
5 changed files with 7 additions and 2 deletions
|
@ -94,6 +94,7 @@ func init() {
|
||||||
flagset.Var(&cfg.CrdKinds, "crd-kinds", " - EXPERIMENTAL (could be removed in future releases) - customize CRD kind names")
|
flagset.Var(&cfg.CrdKinds, "crd-kinds", " - EXPERIMENTAL (could be removed in future releases) - customize CRD kind names")
|
||||||
flagset.BoolVar(&cfg.EnableValidation, "with-validation", true, "Include the validation spec in the CRD")
|
flagset.BoolVar(&cfg.EnableValidation, "with-validation", true, "Include the validation spec in the CRD")
|
||||||
flagset.BoolVar(&cfg.DisableAutoUserGroup, "disable-auto-user-group", false, "Disables the Prometheus Operator setting the `runAsUser` and `fsGroup` fields in Pods.")
|
flagset.BoolVar(&cfg.DisableAutoUserGroup, "disable-auto-user-group", false, "Disables the Prometheus Operator setting the `runAsUser` and `fsGroup` fields in Pods.")
|
||||||
|
flagset.StringVar(&cfg.LocalHost, "localhost", "localhost", "EXPERIMENTAL (could be removed in future releases) - Host used to communicate between local services on a pod. Fixes issues where localhost resolves incorrectly.")
|
||||||
flagset.StringVar(&cfg.LogLevel, "log-level", logLevelInfo, fmt.Sprintf("Log level to use. Possible values: %s", strings.Join(availableLogLevels, ", ")))
|
flagset.StringVar(&cfg.LogLevel, "log-level", logLevelInfo, fmt.Sprintf("Log level to use. Possible values: %s", strings.Join(availableLogLevels, ", ")))
|
||||||
flagset.StringVar(&cfg.LogFormat, "log-format", logFormatLogfmt, fmt.Sprintf("Log format to use. Possible values: %s", strings.Join(availableLogFormats, ", ")))
|
flagset.StringVar(&cfg.LogFormat, "log-format", logFormatLogfmt, fmt.Sprintf("Log format to use. Possible values: %s", strings.Join(availableLogFormats, ", ")))
|
||||||
flagset.BoolVar(&cfg.ManageCRDs, "manage-crds", true, "Manage all CRDs with the Prometheus Operator.")
|
flagset.BoolVar(&cfg.ManageCRDs, "manage-crds", true, "Manage all CRDs with the Prometheus Operator.")
|
||||||
|
|
|
@ -69,6 +69,7 @@ type Operator struct {
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Host string
|
Host string
|
||||||
|
LocalHost string
|
||||||
ConfigReloaderImage string
|
ConfigReloaderImage string
|
||||||
AlertmanagerDefaultBaseImage string
|
AlertmanagerDefaultBaseImage string
|
||||||
Namespace string
|
Namespace string
|
||||||
|
@ -110,6 +111,7 @@ func New(c prometheusoperator.Config, logger log.Logger) (*Operator, error) {
|
||||||
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "alertmanager"),
|
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "alertmanager"),
|
||||||
config: Config{
|
config: Config{
|
||||||
Host: c.Host,
|
Host: c.Host,
|
||||||
|
LocalHost: c.LocalHost,
|
||||||
ConfigReloaderImage: c.ConfigReloaderImage,
|
ConfigReloaderImage: c.ConfigReloaderImage,
|
||||||
AlertmanagerDefaultBaseImage: c.AlertmanagerDefaultBaseImage,
|
AlertmanagerDefaultBaseImage: c.AlertmanagerDefaultBaseImage,
|
||||||
Namespace: c.Namespace,
|
Namespace: c.Namespace,
|
||||||
|
|
|
@ -206,7 +206,7 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
|
||||||
|
|
||||||
localReloadURL := &url.URL{
|
localReloadURL := &url.URL{
|
||||||
Scheme: "http",
|
Scheme: "http",
|
||||||
Host: "localhost:9093",
|
Host: config.LocalHost + ":9093",
|
||||||
Path: path.Clean(webRoutePrefix + "/-/reload"),
|
Path: path.Clean(webRoutePrefix + "/-/reload"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -135,6 +135,7 @@ type Config struct {
|
||||||
CrdKinds monitoringv1.CrdKinds
|
CrdKinds monitoringv1.CrdKinds
|
||||||
EnableValidation bool
|
EnableValidation bool
|
||||||
DisableAutoUserGroup bool
|
DisableAutoUserGroup bool
|
||||||
|
LocalHost string
|
||||||
LogLevel string
|
LogLevel string
|
||||||
LogFormat string
|
LogFormat string
|
||||||
ManageCRDs bool
|
ManageCRDs bool
|
||||||
|
|
|
@ -398,7 +398,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
|
||||||
|
|
||||||
localReloadURL := &url.URL{
|
localReloadURL := &url.URL{
|
||||||
Scheme: "http",
|
Scheme: "http",
|
||||||
Host: "localhost:9090",
|
Host: c.LocalHost + ":9090",
|
||||||
Path: path.Clean(webRoutePrefix + "/-/reload"),
|
Path: path.Clean(webRoutePrefix + "/-/reload"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -602,6 +602,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
|
||||||
|
|
||||||
thanosArgs := []string{"sidecar"}
|
thanosArgs := []string{"sidecar"}
|
||||||
|
|
||||||
|
thanosArgs = append(thanosArgs, fmt.Sprintf("--prometheus.url=http://%s:9090", c.LocalHost))
|
||||||
thanosArgs = append(thanosArgs, fmt.Sprintf("--tsdb.path=%s", storageDir))
|
thanosArgs = append(thanosArgs, fmt.Sprintf("--tsdb.path=%s", storageDir))
|
||||||
if p.Spec.Thanos.Peers != nil {
|
if p.Spec.Thanos.Peers != nil {
|
||||||
thanosArgs = append(thanosArgs, fmt.Sprintf("--cluster.peers=%s", *p.Spec.Thanos.Peers))
|
thanosArgs = append(thanosArgs, fmt.Sprintf("--cluster.peers=%s", *p.Spec.Thanos.Peers))
|
||||||
|
|
Loading…
Add table
Reference in a new issue