Merge branch 'openyurtio:master' into addTunnelServerAddress

.github/workflows/ci.yaml

@@ -22,6 +22,14 @@ env:
 
 jobs:
 
+  check-license:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run Check License
+        run: hack/make-rules/check_license.sh
+
   golangci-lint:
     runs-on: ubuntu-18.04
     steps:

cmd/yurthub/app/config/config.go

@@ -34,6 +34,7 @@ import (
 	"github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/meta"
 	"github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer"
 	"github.com/openyurtio/openyurt/pkg/yurthub/storage/factory"
+	"github.com/openyurtio/openyurt/pkg/yurthub/util"
 	yurtclientset "github.com/openyurtio/yurt-app-manager-api/pkg/yurtappmanager/client/clientset/versioned"
 	yurtinformers "github.com/openyurtio/yurt-app-manager-api/pkg/yurtappmanager/client/informers/externalversions"
 
@@ -78,6 +79,7 @@ type YurtHubConfiguration struct {
 	Filters                           *filter.Filters
 	SharedFactory                     informers.SharedInformerFactory
 	YurtSharedFactory                 yurtinformers.SharedInformerFactory
+	WorkingMode                       util.WorkingMode
 }
 
 // Complete converts *options.YurtHubOptions to *YurtHubConfiguration
@@ -109,6 +111,9 @@ func Complete(options *options.YurtHubOptions) (*YurtHubConfiguration, error) {
 	var filters *filter.Filters
 	var mutatedMasterServiceAddr string
 	if options.EnableResourceFilter {
+		if options.WorkingMode == string(util.WorkingModeCloud) {
+			options.DisabledResourceFilters = append(options.DisabledResourceFilters, filter.DisabledInCloudMode...)
+		}
 		filters = filter.NewFilters(options.DisabledResourceFilters)
 		registerAllFilters(filters)
 
@@ -145,6 +150,7 @@ func Complete(options *options.YurtHubOptions) (*YurtHubConfiguration, error) {
 		EnableDummyIf:                     options.EnableDummyIf,
 		EnableIptables:                    options.EnableIptables,
 		HubAgentDummyIfName:               options.HubAgentDummyIfName,
+		WorkingMode:                       util.WorkingMode(options.WorkingMode),
 		StorageWrapper:                    storageWrapper,
 		SerializerManager:                 serializerManager,
 		RESTMapperManager:                 restMapperManager,

cmd/yurthub/app/options/options.go

@@ -62,6 +62,7 @@ type YurtHubOptions struct {
 	AccessServerThroughHub    bool
 	EnableResourceFilter      bool
 	DisabledResourceFilters   []string
+	WorkingMode               string
 }
 
 // NewYurtHubOptions creates a new YurtHubOptions with a default config.
@@ -90,6 +91,7 @@ func NewYurtHubOptions() *YurtHubOptions {
 		AccessServerThroughHub:    true,
 		EnableResourceFilter:      true,
 		DisabledResourceFilters:   make([]string, 0),
+		WorkingMode:               string(util.WorkingModeEdge),
 	}
 	return o
 }
@@ -112,6 +114,10 @@ func ValidateOptions(options *YurtHubOptions) error {
 		return fmt.Errorf("cert manage mode %s is not supported", options.CertMgrMode)
 	}
 
+	if !util.IsSupportedWorkingMode(util.WorkingMode(options.WorkingMode)) {
+		return fmt.Errorf("working mode %s is not supported", options.WorkingMode)
+	}
+
 	if err := verifyDummyIP(options.HubAgentDummyIfIP); err != nil {
 		return fmt.Errorf("dummy ip %s is not invalid, %v", options.HubAgentDummyIfIP, err)
 	}
@@ -139,7 +145,7 @@ func (o *YurtHubOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.JoinToken, "join-token", o.JoinToken, "the Join token for bootstrapping hub agent when --cert-mgr-mode=hubself.")
 	fs.StringVar(&o.RootDir, "root-dir", o.RootDir, "directory path for managing hub agent files(pki, cache etc).")
 	fs.BoolVar(&o.Version, "version", o.Version, "print the version information.")
-	fs.BoolVar(&o.EnableProfiling, "profiling", o.EnableProfiling, "Enable profiling via web interface host:port/debug/pprof/")
+	fs.BoolVar(&o.EnableProfiling, "profiling", o.EnableProfiling, "enable profiling via web interface host:port/debug/pprof/")
 	fs.BoolVar(&o.EnableDummyIf, "enable-dummy-if", o.EnableDummyIf, "enable dummy interface or not")
 	fs.BoolVar(&o.EnableIptables, "enable-iptables", o.EnableIptables, "enable iptables manager to setup rules for accessing hub agent")
 	fs.StringVar(&o.HubAgentDummyIfIP, "dummy-if-ip", o.HubAgentDummyIfIP, "the ip address of dummy interface that used for container connect hub agent(exclusive ips: 169.254.31.0/24, 169.254.1.1/32)")
@@ -149,6 +155,7 @@ func (o *YurtHubOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&o.EnableResourceFilter, "enable-resource-filter", o.EnableResourceFilter, "enable to filter response that comes back from reverse proxy")
 	fs.StringSliceVar(&o.DisabledResourceFilters, "disabled-resource-filters", o.DisabledResourceFilters, "disable resource filters to handle response")
 	fs.StringVar(&o.NodePoolName, "nodepool-name", o.NodePoolName, "the name of node pool that runs hub agent")
+	fs.StringVar(&o.WorkingMode, "working-mode", o.WorkingMode, "the working mode of yurthub(edge, cloud).")
 }
 
 // verifyDummyIP verify the specified ip is valid or not

cmd/yurthub/app/start.go

@@ -36,6 +36,7 @@ import (
 	"github.com/openyurtio/openyurt/pkg/yurthub/proxy"
 	"github.com/openyurtio/openyurt/pkg/yurthub/server"
 	"github.com/openyurtio/openyurt/pkg/yurthub/transport"
+	"github.com/openyurtio/openyurt/pkg/yurthub/util"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -125,19 +126,28 @@ func Run(cfg *config.YurtHubConfiguration, stopCh <-chan struct{}) error {
 	}
 	trace++
 
-	klog.Infof("%d. new cache manager with storage wrapper and serializer manager", trace)
-	cacheMgr, err := cachemanager.NewCacheManager(cfg.StorageWrapper, cfg.SerializerManager, cfg.RESTMapperManager, cfg.SharedFactory)
-	if err != nil {
-		return fmt.Errorf("could not new cache manager, %v", err)
+	var cacheMgr cachemanager.CacheManager
+	if cfg.WorkingMode == util.WorkingModeEdge {
+		klog.Infof("%d. new cache manager with storage wrapper and serializer manager", trace)
+		cacheMgr, err = cachemanager.NewCacheManager(cfg.StorageWrapper, cfg.SerializerManager, cfg.RESTMapperManager, cfg.SharedFactory)
+		if err != nil {
+			return fmt.Errorf("could not new cache manager, %v", err)
+		}
+	} else {
+		klog.Infof("%d. disable cache manager for node %s because it is a cloud node", trace, cfg.NodeName)
 	}
 	trace++
 
-	klog.Infof("%d. new gc manager for node %s, and gc frequency is a random time between %d min and %d min", trace, cfg.NodeName, cfg.GCFrequency, 3*cfg.GCFrequency)
-	gcMgr, err := gc.NewGCManager(cfg, restConfigMgr, stopCh)
-	if err != nil {
-		return fmt.Errorf("could not new gc manager, %v", err)
+	if cfg.WorkingMode == util.WorkingModeEdge {
+		klog.Infof("%d. new gc manager for node %s, and gc frequency is a random time between %d min and %d min", trace, cfg.NodeName, cfg.GCFrequency, 3*cfg.GCFrequency)
+		gcMgr, err := gc.NewGCManager(cfg, restConfigMgr, stopCh)
+		if err != nil {
+			return fmt.Errorf("could not new gc manager, %v", err)
+		}
+		gcMgr.Run()
+	} else {
+		klog.Infof("%d. disable gc manager for node %s because it is a cloud node", trace, cfg.NodeName)
 	}
-	gcMgr.Run()
 	trace++
 
 	klog.Infof("%d. new filter chain for mutating response body", trace)

hack/make-rules/build-e2e.sh

@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+# Copyright 2020 The OpenYurt Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 YURT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${YURT_ROOT}/hack/lib/init.sh" 
 

hack/make-rules/check_license.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# Copyright 2020 The OpenYurt Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# exit immediately when a command fails
+set -e
+# only exit with zero if all commands of the pipeline exit successfully
+set -o pipefail
+# error on unset variables
+set -u
+
+licRes=$(
+    find . -type f -regex '.*\.go\|.*\.sh' ! -path '*/vendor/*' -exec \
+         sh -c 'head -n4 $1 | grep -Eq "(Copyright|generated|GENERATED)" || echo -e  $1' {} {} \;
+)
+
+if [ -n "${licRes}" ]; then
+        echo -e "license header checking failed:\\n${licRes}"
+        exit 255
+fi

hack/make-rules/generate_client.sh

@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+# Copyright 2020 The OpenYurt Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 set -x
 set -e
 

hack/make-rules/genyaml.sh

@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+# Copyright 2020 The OpenYurt Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 YURT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${YURT_ROOT}/hack/lib/init.sh" 
 

pkg/controller/apis/config/types.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package config
 
 import (

pkg/yurtctl/cmd/convert/convert.go

@@ -158,7 +158,7 @@ func (co *ConvertOptions) Complete(flags *pflag.FlagSet) error {
 	if cnStr != "" {
 		co.CloudNodes = strings.Split(cnStr, ",")
 	} else {
-		err := fmt.Errorf("The '--cloud nodes' parameter cannot be empty.Please specify the cloud node first, and then execute the yurtctl convert command")
+		err := fmt.Errorf("The '--cloud-nodes' parameter cannot be empty.Please specify the cloud node first, and then execute the yurtctl convert command")
 		return err
 	}
 

pkg/yurtctl/cmd/convert/edgenode.go

@@ -277,12 +277,6 @@ func (c *ConvertEdgeNodeOptions) RunConvertEdgeNode() (err error) {
 			return err
 		}
 
-		// 3.6. open the autonomous
-		klog.Infof("open the %s autonomous", nodeName)
-		_, err = kubeutil.AnnotateNode(c.clientSet, node, constants.AnnotationAutonomy, "true")
-		if err != nil {
-			return err
-		}
 	} else {
 		return fmt.Errorf("fail to revert edge node, flag --edge-nodes %s err", c.EdgeNodes)
 	}

pkg/yurtctl/constants/yurt-app-manager-tmpl.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package constants
 
 const (

pkg/yurthub/filter/constant.go

@@ -29,3 +29,6 @@ const (
 	// on kube-proxy list/watch service request from edge nodes.
 	DiscardCloudServiceFilterName = "discardcloudservice"
 )
+
+// DisabledInCloudMode contains the filters that should be disabled when yurthub is working in cloud mode.
+var DisabledInCloudMode = []string{DiscardCloudServiceFilterName}

pkg/yurthub/healthchecker/node_lease_test.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package healthchecker
 
 import (

pkg/yurthub/kubernetes/rest/config_test.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package rest
 
 import (

pkg/yurthub/proxy/proxy.go

@@ -73,10 +73,17 @@ func NewYurtReverseProxyHandler(
 		return nil, err
 	}
 
+	var localProxy *local.LocalProxy
+	// When yurthub is working in cloud mode, cacheMgr will be set to nil which means the local cache is disabled,
+	// so we don't need to create a LocalProxy.
+	if cacheMgr != nil {
+		localProxy = local.NewLocalProxy(cacheMgr, lb.IsHealthy)
+	}
+
 	yurtProxy := &yurtReverseProxy{
 		resolver:            resolver,
 		loadBalancer:        lb,
-		localProxy:          local.NewLocalProxy(cacheMgr, lb.IsHealthy),
+		localProxy:          localProxy,
 		cacheMgr:            cacheMgr,
 		maxRequestsInFlight: yurtHubCfg.MaxRequestInFlight,
 		stopCh:              stopCh,
@@ -88,17 +95,21 @@ func NewYurtReverseProxyHandler(
 func (p *yurtReverseProxy) buildHandlerChain(handler http.Handler) http.Handler {
 	handler = util.WithRequestTrace(handler)
 	handler = util.WithRequestContentType(handler)
-	handler = util.WithCacheHeaderCheck(handler)
+	if p.cacheMgr != nil {
+		handler = util.WithCacheHeaderCheck(handler)
+	}
 	handler = util.WithRequestTimeout(handler)
-	handler = util.WithListRequestSelector(handler)
+	if p.cacheMgr != nil {
+		handler = util.WithListRequestSelector(handler)
+	}
 	handler = util.WithMaxInFlightLimit(handler, p.maxRequestsInFlight)
 	handler = util.WithRequestClientComponent(handler)
 	handler = filters.WithRequestInfo(handler, p.resolver)
 	return handler
 }
 
 func (p *yurtReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	if !hubutil.IsKubeletLeaseReq(req) && p.loadBalancer.IsHealthy() {
+	if !hubutil.IsKubeletLeaseReq(req) && p.loadBalancer.IsHealthy() || p.localProxy == nil {
 		p.loadBalancer.ServeHTTP(rw, req)
 	} else {
 		p.localProxy.ServeHTTP(rw, req)