Added tagging and flags mechanisms

kubernetes · May 11, 2022 · e3a440f · e3a440f
1 parent 2563a4e
commit e3a440f
Show file tree

Hide file tree

Showing 12 changed files with 218 additions and 216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ docs/book/_book/
 site/
 .vscode/
 e2e.test
+.idea/
diff --git a/cmd/aws-cloud-controller-manager/main.go b/cmd/aws-cloud-controller-manager/main.go
@@ -26,6 +26,7 @@ limitations under the License.
 package main
 
 import (
+ "k8s.io/cloud-provider-aws/pkg/controllers/tagging"
  "math/rand"
  "os"
  "time"
@@ -43,8 +44,6 @@ import (
  "k8s.io/klog/v2"
 
  cloudcontrollerconfig "k8s.io/cloud-provider/app/config"
-
- awscontrollers "k8s.io/cloud-provider-aws/pkg/controllers"
 )
 
 const (
@@ -64,8 +63,23 @@ func main() {
  klog.Fatalf("unable to initialize command options: %v", err)
  }
 
- controllerInitializers := awscontrollers.BuildControllerInitializers()
+ controllerInitializers := app.DefaultInitFuncConstructors
+ taggingControllerWrapper := tagging.TaggingControllerWrapper{}
  fss := cliflag.NamedFlagSets{}
+ taggingControllerWrapper.Options.AddFlags(fss.FlagSet("tagging controller"))
+
+ taggingControllerConstructor := app.ControllerInitFuncConstructor{
+ InitContext: app.ControllerInitContext{
+ ClientName: tagging.TaggingControllerClientName,
+ },
+ Constructor: taggingControllerWrapper.StartTaggingControllerWrapper,
+ }
+
+ controllerInitializers[tagging.TaggingControllerKey] = taggingControllerConstructor
+
+ // TODO: remove the following line to enable the route controller
+ delete(controllerInitializers, "route")
+
  command := app.NewCloudControllerManagerCommand(opts, cloudInitializer, controllerInitializers, fss, wait.NeverStop)
 
  if err := command.Execute(); err != nil {

diff --git a/pkg/config/cloud_config.go b/pkg/config/cloud_config.go
diff --git a/pkg/config/controller_config.go b/pkg/config/controller_config.go
diff --git a/pkg/config/runtime_config.go b/pkg/config/runtime_config.go
diff --git a/pkg/controllers/aws_controller_manager.go b/pkg/controllers/aws_controller_manager.go
diff --git a/pkg/controllers/options/tagging_controller.go b/pkg/controllers/options/tagging_controller.go
@@ -0,0 +1,22 @@
+package options
+
+import (
+ "fmt"
+ "github.com/spf13/pflag"
+)
+
+type TaggingControllerOptions struct {
+ Tags map[string]string
+}
+
+func (o *TaggingControllerOptions) AddFlags(fs *pflag.FlagSet) {
+ fs.StringToStringVar(&o.Tags, "tags", o.Tags, "Tags to apply to AWS resources in the tagging controller.")
+}
+
+func (o *TaggingControllerOptions) Validate() error {
+ if len(o.Tags) == 0 {
+ return fmt.Errorf("--tags must not be empty.")
+ }
+
+ return nil
+}