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 2021/04/28 02:02:55 UTC
[GitHub] [apisix-ingress-controller] tokers commented on a change in pull request #408: feat: add upstream status & tls status
tokers commented on a change in pull request #408:
URL: https://github.com/apache/apisix-ingress-controller/pull/408#discussion_r621751777
##########
File path: pkg/ingress/status.go
##########
@@ -50,3 +52,49 @@ func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string, s
_, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(ar.Namespace).
UpdateStatus(context.TODO(), ar, metav1.UpdateOptions{})
}
+
+// recordStatus record resources status
+func recordStatus(at interface{}, reason string, err error, status v1.ConditionStatus) {
+ // build condition
+ message := fmt.Sprintf(_messageResourceSynced, _component)
+ if err != nil {
+ message = err.Error()
+ }
+ condition := metav1.Condition{
+ Type: _conditionType,
+ Reason: reason,
+ Status: status,
+ Message: message,
+ }
+
+ switch v := at.(type) {
+ case *configv1.ApisixTls:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV1().ApisixTlses(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
+ case *configv1.ApisixUpstream:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV1().ApisixUpstreams(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
+ case *configv2alpha1.ApisixRoute:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
Review comment:
Add a `default` arm.
##########
File path: pkg/ingress/status.go
##########
@@ -50,3 +52,49 @@ func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string, s
_, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(ar.Namespace).
UpdateStatus(context.TODO(), ar, metav1.UpdateOptions{})
}
+
+// recordStatus record resources status
+func recordStatus(at interface{}, reason string, err error, status v1.ConditionStatus) {
+ // build condition
+ message := fmt.Sprintf(_messageResourceSynced, _component)
Review comment:
Both `_messageResourceSynced` and `_component` are known in advance (defined as package level variables), why not just prepare this message in the `var` block so we don't have to compose it each time `recordStatus` is invoked.
##########
File path: pkg/ingress/status.go
##########
@@ -50,3 +52,49 @@ func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string, s
_, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(ar.Namespace).
UpdateStatus(context.TODO(), ar, metav1.UpdateOptions{})
}
+
+// recordStatus record resources status
Review comment:
```suggestion
// recordStatus record resources status
```
##########
File path: pkg/kube/apisix/apis/config/v1/types.go
##########
@@ -83,7 +84,8 @@ type ApisixUpstream struct {
metav1.TypeMeta `json:",inline" yaml:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
- Spec *ApisixUpstreamSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
+ Spec *ApisixUpstreamSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
Review comment:
I'm wondering whether we can just use value for `Spec` field, not pointer.
##########
File path: pkg/ingress/status.go
##########
@@ -50,3 +52,49 @@ func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string, s
_, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(ar.Namespace).
UpdateStatus(context.TODO(), ar, metav1.UpdateOptions{})
}
+
+// recordStatus record resources status
+func recordStatus(at interface{}, reason string, err error, status v1.ConditionStatus) {
+ // build condition
+ message := fmt.Sprintf(_messageResourceSynced, _component)
+ if err != nil {
+ message = err.Error()
+ }
+ condition := metav1.Condition{
+ Type: _conditionType,
+ Reason: reason,
+ Status: status,
+ Message: message,
+ }
+
+ switch v := at.(type) {
+ case *configv1.ApisixTls:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV1().ApisixTlses(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
+ case *configv1.ApisixUpstream:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV1().ApisixUpstreams(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
+ case *configv2alpha1.ApisixRoute:
+ // set to status
+ if v.Status.Conditions == nil {
+ conditions := make([]metav1.Condition, 0)
+ v.Status.Conditions = &conditions
+ }
+ meta.SetStatusCondition(v.Status.Conditions, condition)
+ _, _ = kube.GetApisixClient().ApisixV2alpha1().ApisixRoutes(v.Namespace).
+ UpdateStatus(context.TODO(), v, metav1.UpdateOptions{})
Review comment:
As the `default` arm never should be executed, we can just panic there.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org