diff --git a/changelogs/unreleased/6784-yanggangtony b/changelogs/unreleased/6784-yanggangtony new file mode 100644 index 0000000000..8d63d94a18 --- /dev/null +++ b/changelogs/unreleased/6784-yanggangtony @@ -0,0 +1 @@ +Fix the node-agent missing metrics-address defines. \ No newline at end of file diff --git a/pkg/cmd/cli/nodeagent/server.go b/pkg/cmd/cli/nodeagent/server.go index 10df06f89e..105e370524 100644 --- a/pkg/cmd/cli/nodeagent/server.go +++ b/pkg/cmd/cli/nodeagent/server.go @@ -114,6 +114,7 @@ func NewServerCommand(f client.Factory) *cobra.Command { command.Flags().Var(formatFlag, "log-format", fmt.Sprintf("The format for log output. Valid values are %s.", strings.Join(formatFlag.AllowedValues(), ", "))) command.Flags().DurationVar(&config.resourceTimeout, "resource-timeout", config.resourceTimeout, "How long to wait for resource processes which are not covered by other specific timeout parameters. Default is 10 minutes.") command.Flags().DurationVar(&config.dataMoverPrepareTimeout, "data-mover-prepare-timeout", config.dataMoverPrepareTimeout, "How long to wait for preparing a DataUpload/DataDownload. Default is 30 minutes.") + command.Flags().StringVar(&config.metricsAddress, "metrics-address", config.metricsAddress, "The address to expose prometheus metrics") return command } @@ -193,14 +194,15 @@ func newNodeAgentServer(logger logrus.FieldLogger, factory client.Factory, confi } s := &nodeAgentServer{ - logger: logger, - ctx: ctx, - cancelFunc: cancelFunc, - fileSystem: filesystem.NewFileSystem(), - mgr: mgr, - config: config, - namespace: factory.Namespace(), - nodeName: nodeName, + logger: logger, + ctx: ctx, + cancelFunc: cancelFunc, + fileSystem: filesystem.NewFileSystem(), + mgr: mgr, + config: config, + namespace: factory.Namespace(), + nodeName: nodeName, + metricsAddress: config.metricsAddress, } // the cache isn't initialized yet when "validatePodVolumesHostPath" is called, the client returned by the manager cannot diff --git a/pkg/install/daemonset.go b/pkg/install/daemonset.go index 8e74e16da1..17580f05d6 100644 --- a/pkg/install/daemonset.go +++ b/pkg/install/daemonset.go @@ -105,6 +105,7 @@ func DaemonSet(namespace string, opts ...podTemplateOption) *appsv1.DaemonSet { { Name: "node-agent", Image: c.image, + Ports: containerPorts(), ImagePullPolicy: pullPolicy, Command: []string{ "/velero",