expose kubeconfig flag to run the agent binary on a host #94
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,33 +8,44 @@ import ( | |
| "os/signal" | ||
| "syscall" | ||
|
|
||
| "github.com/openshift/library-go/pkg/controller/controllercmd" | ||
| "github.com/openshift/library-go/pkg/operator/events" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/pflag" | ||
| utilruntime "k8s.io/apimachinery/pkg/util/runtime" | ||
| "k8s.io/client-go/rest" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| utilflag "k8s.io/component-base/cli/flag" | ||
| "k8s.io/klog/v2" | ||
| ocmfeature "open-cluster-management.io/api/feature" | ||
| "open-cluster-management.io/ocm/pkg/common/options" | ||
| "open-cluster-management.io/ocm/pkg/features" | ||
| "open-cluster-management.io/ocm/pkg/work/spoke" | ||
| ) | ||
|
|
||
| func NewAgentCommand() *cobra.Command { | ||
| agentOptions := NewAgentOptions() | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "agent", | ||
| Short: "Start the maestro agent", | ||
| Long: "Start the maestro agent.", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
|
|
||
| stopCh := make(chan os.Signal, 1) | ||
| signal.Notify(stopCh, syscall.SIGINT, syscall.SIGTERM) | ||
| go func() { | ||
| defer cancel() | ||
| <-stopCh | ||
| }() | ||
|
|
||
| if err := agentOptions.Run(ctx); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| <-ctx.Done() | ||
| }, | ||
| } | ||
|
|
||
| // check if the flag is already registered to avoid duplicate flag define error | ||
|
|
@@ -47,53 +58,98 @@ func NewAgentCommand() *cobra.Command { | |
| fs := cmd.PersistentFlags() | ||
| fs.SetNormalizeFunc(utilflag.WordSepNormalizeFunc) | ||
| fs.AddGoFlagSet(flag.CommandLine) | ||
| agentOptions.AddFlags(fs) | ||
|
|
||
| utilruntime.Must(features.SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeWorkFeatureGates)) | ||
| utilruntime.Must(features.SpokeMutableFeatureGate.Set(fmt.Sprintf("%s=true", ocmfeature.RawFeedbackJsonString))) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| type AgentOptions struct { | ||
| CommonOptions *options.AgentOptions | ||
| WorkOptions *spoke.WorkloadAgentOptions | ||
| KubeConfigFile string | ||
| Namespace string | ||
| } | ||
|
|
||
| func NewAgentOptions() *AgentOptions { | ||
| workOptions := spoke.NewWorkloadAgentOptions() | ||
| // use 1M as the default limit for state feedback | ||
| workOptions.MaxJSONRawLength = 1024 * 1024 | ||
| // use mqtt as the default driver | ||
| workOptions.WorkloadSourceDriver = "mqtt" | ||
| // use manifest as the default codec | ||
| workOptions.CloudEventsClientCodecs = []string{"manifest"} | ||
|
There was a problem hiding this comment. Could you update to support There was a problem hiding this comment. I'm not sure, we should enable both codecs at the same time, for maestro, it should only handle the manifest, right? There was a problem hiding this comment. Let us handle it in separate issue #96 |
||
|
|
||
| return &AgentOptions{ | ||
| CommonOptions: options.NewAgentOptions(), | ||
| WorkOptions: workOptions, | ||
| } | ||
| } | ||
|
|
||
| func (o *AgentOptions) Run(ctx context.Context) error { | ||
| kubeConfig, err := rest.InClusterConfig() | ||
| if err != nil { | ||
| klog.Warningf("failed to get kubeconfig from cluster inside, will use '--kubeconfig' to build client") | ||
|
|
||
| kubeConfig, err = clientcmd.BuildConfigFromFlags("", o.KubeConfigFile) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to load kubeconfig from file %q: %v", o.KubeConfigFile, err) | ||
| } | ||
| } | ||
|
|
||
| namespace := o.Namespace | ||
| if len(namespace) == 0 { | ||
| namespace, err = getComponentNamespace() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| controllerContext := &controllercmd.ControllerContext{ | ||
| KubeConfig: kubeConfig, | ||
| EventRecorder: events.NewLoggingEventRecorder("maestro-agent"), | ||
| OperatorNamespace: namespace, | ||
| } | ||
|
|
||
| return spoke.NewWorkAgentConfig(o.CommonOptions, o.WorkOptions). | ||
| RunWorkloadAgent(ctx, controllerContext) | ||
| } | ||
|
|
||
| func (o *AgentOptions) AddFlags(fs *pflag.FlagSet) { | ||
| fs.StringVar(&o.KubeConfigFile, "kubeconfig", | ||
| o.KubeConfigFile, "Location of the kubeconfig file") | ||
| fs.StringVar(&o.Namespace, "namespace", | ||
| o.Namespace, "Namespace where the agent runs") | ||
| // workloadAgentOptions | ||
| fs.Float32Var(&o.CommonOptions.CommoOpts.QPS, "kube-api-qps", | ||
| o.CommonOptions.CommoOpts.QPS, "QPS to use while talking with apiserver on spoke cluster") | ||
| fs.IntVar(&o.CommonOptions.CommoOpts.Burst, "kube-api-burst", | ||
| o.CommonOptions.CommoOpts.Burst, "Burst to use while talking with apiserver on spoke cluster") | ||
| fs.Int32Var(&o.WorkOptions.MaxJSONRawLength, "max-json-raw-length", | ||
| o.WorkOptions.MaxJSONRawLength, "The maximum size of the JSON raw string returned from status feedback") | ||
| fs.DurationVar(&o.WorkOptions.StatusSyncInterval, "status-sync-interval", | ||
| o.WorkOptions.StatusSyncInterval, "Interval to sync resource status to hub") | ||
| fs.DurationVar(&o.WorkOptions.AppliedManifestWorkEvictionGracePeriod, "resource-eviction-grace-period", | ||
| o.WorkOptions.AppliedManifestWorkEvictionGracePeriod, "Grace period for resource eviction") | ||
| fs.StringVar(&o.CommonOptions.SpokeClusterName, "consumer-name", | ||
| o.CommonOptions.SpokeClusterName, "Name of the consumer") | ||
| // message broker config file | ||
| fs.StringVar(&o.WorkOptions.WorkloadSourceConfig, "message-broker-config-file", | ||
| o.WorkOptions.WorkloadSourceConfig, "The config file path of the message broker, it can be mqtt broker or kafka broker") | ||
| fs.StringVar(&o.WorkOptions.WorkloadSourceDriver, "message-broker-type", | ||
| o.WorkOptions.WorkloadSourceDriver, "Message broker type") | ||
| fs.StringVar(&o.WorkOptions.CloudEventsClientID, "agent-client-id", | ||
| o.WorkOptions.CloudEventsClientID, "The ID of the agent client, by default it is <consumer-id>-work-agent") | ||
| fs.StringSliceVar(&o.WorkOptions.CloudEventsClientCodecs, "agent-client-codecs", | ||
|
There was a problem hiding this comment. can we propagate that up to the agent template https://github.com/openshift-online/maestro/blob/e3bdb59e5444b1e87b0a28828e0ae59d034f010c/templates/agent-template.yml ? |
||
| o.WorkOptions.CloudEventsClientCodecs, "The codecs of the agent client. The valid codecs are manifest and manifestbundle") | ||
| } | ||
|
|
||
| func getComponentNamespace() (string, error) { | ||
| nsBytes, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace") | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| return string(nsBytes), nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remembered it was set in agent options. Do you need to reset it again?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, but the default value is small for maestro case, we need increase it here