!42 Categorize input parameters; with yaml.v3

Merge pull request !42 from zongzw/zong-gopkg.in-yaml.v3

Author: zongzw

controllers/v1_controller.go

@@ -103,17 +103,24 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	if err := r.Get(ctx, req.NamespacedName, &obj); err != nil {
 		if client.IgnoreNotFound(err) == nil {
 			k8s.NodeCache.Unset(req.Name)
-			if ncfgs, err = pkg.ParseNodeConfigs(); err != nil {
-				return ctrl.Result{}, err
-			}
-			pkg.PendingDeploys <- pkg.DeployRequest{
-				Meta:       fmt.Sprintf("refreshing for request '%s'", req.Name),
-				From:       &ocfgs,
-				To:         &ncfgs,
-				StatusFunc: func() {},
-				Partition:  "Common",
-				Context:    lctx,
+			for _, c := range pkg.BIPConfigs {
+				if ncfgs, err = pkg.ParseNodeConfigs(&c); err != nil {
+					return ctrl.Result{}, err
+				}
+				if c.Management.Port == nil {
+					*c.Management.Port = 443
+				}
+				url := fmt.Sprintf("https://%s:%d", c.Management.IpAddress, *c.Management.Port)
+				pkg.PendingDeploys <- pkg.DeployRequest{
+					Meta:       fmt.Sprintf("refreshing for request '%s'", req.Name),
+					From:       &ocfgs,
+					To:         &ncfgs,
+					StatusFunc: func() {},
+					Partition:  "Common",
+					Context:    context.WithValue(lctx, pkg.CtxKey_SpecifiedBIGIP, url),
+				}
 			}
+
 		} else {
 			return ctrl.Result{}, err
 		}
@@ -124,16 +131,22 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		if newa := k8s.NodeCache.Get(obj.Name); reflect.DeepEqual(orig, newa) {
 			return ctrl.Result{}, nil
 		}
-		if ncfgs, err = pkg.ParseNodeConfigs(); err != nil {
-			return ctrl.Result{}, err
-		}
-		pkg.PendingDeploys <- pkg.DeployRequest{
-			Meta:       fmt.Sprintf("refreshing for request '%s'", req.Name),
-			From:       &ocfgs,
-			To:         &ncfgs,
-			StatusFunc: func() {},
-			Partition:  "Common",
-			Context:    lctx,
+		for _, c := range pkg.BIPConfigs {
+			if ncfgs, err = pkg.ParseNodeConfigs(&c); err != nil {
+				return ctrl.Result{}, err
+			}
+			if c.Management.Port == nil {
+				*c.Management.Port = 443
+			}
+			url := fmt.Sprintf("https://%s:%d", c.Management.IpAddress, *c.Management.Port)
+			pkg.PendingDeploys <- pkg.DeployRequest{
+				Meta:       fmt.Sprintf("refreshing for request '%s'", req.Name),
+				From:       &ocfgs,
+				To:         &ncfgs,
+				StatusFunc: func() {},
+				Partition:  "Common",
+				Context:    context.WithValue(lctx, pkg.CtxKey_SpecifiedBIGIP, url),
+			}
 		}
 	}
 	return ctrl.Result{}, nil

deploy/3.deploy-bigip-kubernetes-gateway-controller.yaml

@@ -6,7 +6,7 @@ metadata:
   name: bigip-login
   namespace: kube-system
 data:
-  password: UEBzc3cwcmQxMjM=              # base64 encoded 'mypassword'
+  password: UEBzc3cwcmQxMjM=   # base64 encoded
 type: Opaque
 
 ---
@@ -17,24 +17,23 @@ metadata:
   name: bigip-kubernetes-gateway-configmap
   namespace: kube-system
 data:
-  bigip-kubernetes-gateway-config.yaml: |
-    bigips:
-      - mgmtIpAddress: "10.50.17.104"
-        vxlanProfileName: "fl-vxlan"
-        vxlanPort: "8472"
-        vxlanLocalAddress: "4.4.4.4"
-        selfIpName: "flannel-self"
-        selfIpAddress: "5.5.5.5/28"
-        url: "https://10.50.17.104:8443"
-        username: "admin"
-      - mgmtIpAddress: "10.50.15.173"
-        vxlanProfileName: "fl-vxlan"
-        vxlanPort: "8472"
-        vxlanLocalAddress: "4.4.4.5"
-        selfIpName: "flannel-self"
-        selfIpAddress: "5.5.5.6/28"
-        url: "https://10.50.15.173:8443"
-        username: "admin"
+  bigip-kubernetes-gateway-config: |
+    - management:
+        username: admin
+        ipAddress: 10.250.15.180
+        port: 443
+      flannel:
+        tunnels:
+          - name: fl-tunnel
+            profileName: fl-vxlan
+            port: 8472
+            localAddress: 10.250.18.119
+        selfIPs:
+          - name: flannel-self
+            ipMask: 10.42.20.1/16
+            tunnelName: fl-tunnel
+      # calico:
+      #   kindsOfConfigItems: ""
 
 ---
 

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.3.1
 	github.com/onsi/gomega v1.22.1
 	github.com/prometheus/client_golang v1.13.0
-	github.com/spf13/viper v1.14.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.25.3
 	k8s.io/apimachinery v0.25.3
 	k8s.io/client-go v0.25.3
@@ -45,28 +45,20 @@ require (
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
@@ -81,9 +73,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
 	k8s.io/component-base v0.25.0 // indirect
 	k8s.io/klog/v2 v2.70.1 // indirect