You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2022/06/15 03:38:42 UTC
[GitHub] [apisix-ingress-controller] tao12345666333 commented on a diff in pull request #1079: feat: support GatewayClass, refactor gateway modules
tao12345666333 commented on code in PR #1079:
URL: https://github.com/apache/apisix-ingress-controller/pull/1079#discussion_r897499121
##########
pkg/ingress/namespace/provider.go:
##########
@@ -0,0 +1,171 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you 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 namespace
+
+import (
+ "context"
+ "strings"
+ "sync"
+
+ "go.uber.org/zap"
+ v1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/labels"
+ listerscorev1 "k8s.io/client-go/listers/core/v1"
+ "k8s.io/client-go/tools/cache"
+
+ "github.com/apache/apisix-ingress-controller/pkg/api/validation"
+ "github.com/apache/apisix-ingress-controller/pkg/config"
+ "github.com/apache/apisix-ingress-controller/pkg/ingress/utils"
+ "github.com/apache/apisix-ingress-controller/pkg/kube"
+ "github.com/apache/apisix-ingress-controller/pkg/log"
+ "github.com/apache/apisix-ingress-controller/pkg/types"
+)
+
+type WatchingProvider interface {
+ Run(ctx context.Context)
+ IsWatchingNamespace(key string) bool
+ WatchingNamespaces() []string
+}
+
+func NewWatchingProvider(ctx context.Context, kube *kube.KubeClient, cfg *config.Config) (WatchingProvider, error) {
+ var (
+ watchingNamespaces = new(sync.Map)
+ watchingLabels = make(map[string]string)
+ )
+ if len(cfg.Kubernetes.AppNamespaces) > 1 || cfg.Kubernetes.AppNamespaces[0] != v1.NamespaceAll {
+ for _, ns := range cfg.Kubernetes.AppNamespaces {
+ watchingNamespaces.Store(ns, struct{}{})
+ }
+ }
+ // support namespace label-selector
+ for _, selector := range cfg.Kubernetes.NamespaceSelector {
+ labelSlice := strings.Split(selector, "=")
+ watchingLabels[labelSlice[0]] = labelSlice[1]
+ }
+
+ // watchingNamespaces and watchingLabels are empty means to monitor all namespaces.
+ if !validation.HasValueInSyncMap(watchingNamespaces) && len(watchingLabels) == 0 {
+ opts := metav1.ListOptions{}
+ // list all namespaces
+ nsList, err := kube.Client.CoreV1().Namespaces().List(ctx, opts)
+ if err != nil {
+ log.Error(err.Error())
+ ctx.Done()
+ } else {
+ wns := new(sync.Map)
+ for _, v := range nsList.Items {
+ wns.Store(v.Name, struct{}{})
+ }
+ watchingNamespaces = wns
+ }
+ }
+
+ c := &watchingProvider{
+ kube: kube,
+ cfg: cfg,
+
+ watchingNamespaces: watchingNamespaces,
+ watchingLabels: watchingLabels,
+ }
+
+ kubeFactory := kube.NewSharedIndexInformerFactory()
+ c.namespaceInformer = kubeFactory.Core().V1().Namespaces().Informer()
+ c.namespaceLister = kubeFactory.Core().V1().Namespaces().Lister()
+
+ c.controller = newNamespaceController(c)
+
+ err := c.initWatchingNamespacesByLabels(ctx)
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
+}
+
+type watchingProvider struct {
+ kube *kube.KubeClient
+ cfg *config.Config
+
+ watchingNamespaces *sync.Map
+ watchingLabels types.Labels
+
+ namespaceInformer cache.SharedIndexInformer
+ namespaceLister listerscorev1.NamespaceLister
+
+ controller *namespaceController
+}
+
+func (c *watchingProvider) initWatchingNamespacesByLabels(ctx context.Context) error {
+ labelSelector := metav1.LabelSelector{MatchLabels: c.watchingLabels}
+ opts := metav1.ListOptions{
+ LabelSelector: labels.Set(labelSelector.MatchLabels).String(),
+ }
+ namespaces, err := c.kube.Client.CoreV1().Namespaces().List(ctx, opts)
+ if err != nil {
+ return err
+ }
+ var nss []string
+
+ for _, ns := range namespaces.Items {
+ nss = append(nss, ns.Name)
+ c.watchingNamespaces.Store(ns.Name, struct{}{})
+ }
+ log.Infow("label selector watching namespaces", zap.Strings("namespaces", nss))
+ return nil
+}
+
+func (c *watchingProvider) Run(ctx context.Context) {
+ e := utils.ParallelExecutor{}
+
+ e.Add(func() {
+ c.namespaceInformer.Run(ctx.Done())
+ })
+
+ e.Add(func() {
+ c.controller.run(ctx)
+ })
+
+ e.Wait()
+}
+
+func (c *watchingProvider) WatchingNamespaces() []string {
+ var keys []string
+ c.watchingNamespaces.Range(func(key, _ interface{}) bool {
+ keys = append(keys, key.(string))
+ return true
+ })
+ return keys
+}
+
+// isWatchingNamespace accepts a resource key, getting the namespace part
Review Comment:
```suggestion
// IsWatchingNamespace accepts a resource key, getting the namespace part
```
##########
pkg/ingress/namespace/namespace.go:
##########
@@ -22,21 +22,28 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"github.com/apache/apisix-ingress-controller/pkg/log"
"github.com/apache/apisix-ingress-controller/pkg/types"
)
+// FIXME: Controller should be the Core Part,
+// Provider should act as "EventHandler", register there functions to Controller
Review Comment:
Will it be implemented in a follow-up PR?
##########
pkg/ingress/namespace/provider.go:
##########
@@ -0,0 +1,171 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you 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 namespace
+
+import (
+ "context"
+ "strings"
+ "sync"
+
+ "go.uber.org/zap"
+ v1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/labels"
+ listerscorev1 "k8s.io/client-go/listers/core/v1"
+ "k8s.io/client-go/tools/cache"
+
+ "github.com/apache/apisix-ingress-controller/pkg/api/validation"
+ "github.com/apache/apisix-ingress-controller/pkg/config"
+ "github.com/apache/apisix-ingress-controller/pkg/ingress/utils"
+ "github.com/apache/apisix-ingress-controller/pkg/kube"
+ "github.com/apache/apisix-ingress-controller/pkg/log"
+ "github.com/apache/apisix-ingress-controller/pkg/types"
+)
+
+type WatchingProvider interface {
+ Run(ctx context.Context)
+ IsWatchingNamespace(key string) bool
+ WatchingNamespaces() []string
+}
+
+func NewWatchingProvider(ctx context.Context, kube *kube.KubeClient, cfg *config.Config) (WatchingProvider, error) {
+ var (
+ watchingNamespaces = new(sync.Map)
+ watchingLabels = make(map[string]string)
+ )
+ if len(cfg.Kubernetes.AppNamespaces) > 1 || cfg.Kubernetes.AppNamespaces[0] != v1.NamespaceAll {
+ for _, ns := range cfg.Kubernetes.AppNamespaces {
+ watchingNamespaces.Store(ns, struct{}{})
+ }
+ }
+ // support namespace label-selector
+ for _, selector := range cfg.Kubernetes.NamespaceSelector {
+ labelSlice := strings.Split(selector, "=")
+ watchingLabels[labelSlice[0]] = labelSlice[1]
+ }
+
+ // watchingNamespaces and watchingLabels are empty means to monitor all namespaces.
+ if !validation.HasValueInSyncMap(watchingNamespaces) && len(watchingLabels) == 0 {
+ opts := metav1.ListOptions{}
+ // list all namespaces
+ nsList, err := kube.Client.CoreV1().Namespaces().List(ctx, opts)
+ if err != nil {
+ log.Error(err.Error())
+ ctx.Done()
+ } else {
+ wns := new(sync.Map)
+ for _, v := range nsList.Items {
+ wns.Store(v.Name, struct{}{})
+ }
+ watchingNamespaces = wns
+ }
+ }
+
+ c := &watchingProvider{
+ kube: kube,
+ cfg: cfg,
+
+ watchingNamespaces: watchingNamespaces,
+ watchingLabels: watchingLabels,
+ }
+
+ kubeFactory := kube.NewSharedIndexInformerFactory()
+ c.namespaceInformer = kubeFactory.Core().V1().Namespaces().Informer()
+ c.namespaceLister = kubeFactory.Core().V1().Namespaces().Lister()
+
+ c.controller = newNamespaceController(c)
+
+ err := c.initWatchingNamespacesByLabels(ctx)
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
+}
+
+type watchingProvider struct {
+ kube *kube.KubeClient
+ cfg *config.Config
+
+ watchingNamespaces *sync.Map
+ watchingLabels types.Labels
+
+ namespaceInformer cache.SharedIndexInformer
+ namespaceLister listerscorev1.NamespaceLister
+
+ controller *namespaceController
+}
+
+func (c *watchingProvider) initWatchingNamespacesByLabels(ctx context.Context) error {
+ labelSelector := metav1.LabelSelector{MatchLabels: c.watchingLabels}
+ opts := metav1.ListOptions{
+ LabelSelector: labels.Set(labelSelector.MatchLabels).String(),
+ }
+ namespaces, err := c.kube.Client.CoreV1().Namespaces().List(ctx, opts)
+ if err != nil {
+ return err
+ }
+ var nss []string
+
+ for _, ns := range namespaces.Items {
+ nss = append(nss, ns.Name)
+ c.watchingNamespaces.Store(ns.Name, struct{}{})
+ }
+ log.Infow("label selector watching namespaces", zap.Strings("namespaces", nss))
+ return nil
+}
+
+func (c *watchingProvider) Run(ctx context.Context) {
+ e := utils.ParallelExecutor{}
+
+ e.Add(func() {
+ c.namespaceInformer.Run(ctx.Done())
+ })
+
+ e.Add(func() {
+ c.controller.run(ctx)
+ })
+
+ e.Wait()
+}
+
+func (c *watchingProvider) WatchingNamespaces() []string {
+ var keys []string
+ c.watchingNamespaces.Range(func(key, _ interface{}) bool {
+ keys = append(keys, key.(string))
+ return true
+ })
+ return keys
+}
+
+// isWatchingNamespace accepts a resource key, getting the namespace part
Review Comment:
```suggestion
// IsWatchingNamespace accepts a resource key, getting the namespace part
```
```suggestion
// isWatchingNamespace accepts a resource key, getting the namespace part
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org