feat: add events and status for ApisixClusterConfig resource (#502)

apache · May 31, 2021 · 029c0d7 · 029c0d7
1 parent a89be23
commit 029c0d7
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 1 deletion.
diff --git a/pkg/ingress/apisix_cluster_config.go b/pkg/ingress/apisix_cluster_config.go
@@ -19,7 +19,9 @@ import (
 	"time"
 
 	"go.uber.org/zap"
+	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
@@ -140,6 +142,8 @@ func (c *apisixClusterConfigController) sync(ctx context.Context, ev *types.Even
 				zap.Error(err),
 				zap.Any("opts", clusterOpts),
 			)
+			c.controller.recorderEvent(acc, corev1.EventTypeWarning, _resourceSyncAborted, err)
+			c.controller.recordStatus(acc, _resourceSyncAborted, err, metav1.ConditionFalse)
 			return err
 		}
 	}
@@ -152,6 +156,8 @@ func (c *apisixClusterConfigController) sync(ctx context.Context, ev *types.Even
 			zap.String("key", key),
 			zap.Any("object", acc),
 		)
+		c.controller.recorderEvent(acc, corev1.EventTypeWarning, _resourceSyncAborted, err)
+		c.controller.recordStatus(acc, _resourceSyncAborted, err, metav1.ConditionFalse)
 		return err
 	}
 	log.Debugw("translated global_rule",
@@ -169,8 +175,12 @@ func (c *apisixClusterConfigController) sync(ctx context.Context, ev *types.Even
 			zap.Any("global_rule", globalRule),
 			zap.Any("cluster", acc.Name),
 		)
+		c.controller.recorderEvent(acc, corev1.EventTypeWarning, _resourceSyncAborted, err)
+		c.controller.recordStatus(acc, _resourceSyncAborted, err, metav1.ConditionFalse)
 		return err
 	}
+	c.controller.recorderEvent(acc, corev1.EventTypeNormal, _resourceSynced, nil)
+	c.controller.recordStatus(acc, _resourceSynced, nil, metav1.ConditionTrue)
 	return nil
 }
 

diff --git a/pkg/kube/apisix/apis/config/v2alpha1/types.go b/pkg/kube/apisix/apis/config/v2alpha1/types.go
@@ -263,7 +263,8 @@ type ApisixClusterConfig struct {
 	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
 
 	// Spec defines the desired state of ApisixClusterConfigSpec.
-	Spec ApisixClusterConfigSpec `json:"spec" yaml:"spec"`
+	Spec   ApisixClusterConfigSpec `json:"spec" yaml:"spec"`
+	Status ApisixStatus            `json:"status,omitempty" yaml:"status,omitempty"`
 }
 
 // ApisixClusterConfigSpec defines the desired state of ApisixClusterConfigSpec.

diff --git a/pkg/kube/apisix/apis/config/v2alpha1/zz_generated.deepcopy.go b/pkg/kube/apisix/apis/config/v2alpha1/zz_generated.deepcopy.go
diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2alpha1/apisixclusterconfig.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2alpha1/apisixclusterconfig.go
diff --git a/.../apisix/client/clientset/versioned/typed/config/v2alpha1/fake/fake_apisixclusterconfig.go b/.../apisix/client/clientset/versioned/typed/config/v2alpha1/fake/fake_apisixclusterconfig.go
diff --git a/samples/deploy/rbac/apisix_view_clusterrole.yaml b/samples/deploy/rbac/apisix_view_clusterrole.yaml
@@ -146,7 +146,9 @@ rules:
   - apisixtlses
   - apisixtlses/status
   - apisixclusterconfigs
+  - apisixclusterconfigs/status
   - apisixconsumers
+  - apisixconsumers/status
   verbs:
   - '*'
 - apiGroups:

diff --git a/test/e2e/scaffold/ingress.go b/test/e2e/scaffold/ingress.go
@@ -158,7 +158,9 @@ rules:
       - apisixtlses
       - apisixtlses/status
       - apisixclusterconfigs
+      - apisixclusterconfigs/status
       - apisixconsumers
+      - apisixconsumers/status
     verbs:
       - '*'
   - apiGroups: