tokers commented on a change in pull request #408:
URL:
https://github.com/apache/apisix-ingress-controller/pull/408#discussion_r622210624
##########
File path: pkg/ingress/status.go
##########
@@ -23,30 +23,61 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/apache/apisix-ingress-controller/pkg/kube"
+ configv1
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
configv2alpha1
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2alpha1"
+ "github.com/apache/apisix-ingress-controller/pkg/log"
)
const (
_conditionType = "ResourcesAvailable"
_commonSuccessMessage = "Sync Successfully"
)
-// recordRouteStatus record ApisixRoute v2alpha1 status
-func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string,
status v1.ConditionStatus) {
+// recordStatus record resources status
+func recordStatus(at interface{}, reason string, err error, status
v1.ConditionStatus) {
// build condition
+ message := _commonSuccessMessage
+ if err != nil {
+ message = err.Error()
+ }
condition := metav1.Condition{
Type: _conditionType,
Reason: reason,
Status: status,
Message: message,
}
- // set to status
- if ar.Status.Conditions == nil {
- conditions := make([]metav1.Condition, 0)
- ar.Status.Conditions = &conditions
+ 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).
Review comment:
Why ignore both the return values?
##########
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:
OK.
##########
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:
Got it.
##########
File path: pkg/ingress/status.go
##########
@@ -23,30 +23,61 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/apache/apisix-ingress-controller/pkg/kube"
+ configv1
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
configv2alpha1
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2alpha1"
+ "github.com/apache/apisix-ingress-controller/pkg/log"
)
const (
_conditionType = "ResourcesAvailable"
_commonSuccessMessage = "Sync Successfully"
)
-// recordRouteStatus record ApisixRoute v2alpha1 status
-func recordRouteStatus(ar *configv2alpha1.ApisixRoute, reason, message string,
status v1.ConditionStatus) {
+// recordStatus record resources status
+func recordStatus(at interface{}, reason string, err error, status
v1.ConditionStatus) {
// build condition
+ message := _commonSuccessMessage
+ if err != nil {
+ message = err.Error()
+ }
condition := metav1.Condition{
Type: _conditionType,
Reason: reason,
Status: status,
Message: message,
}
- // set to status
- if ar.Status.Conditions == nil {
- conditions := make([]metav1.Condition, 0)
- ar.Status.Conditions = &conditions
+ 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).
Review comment:
Ditto.
--
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:
[email protected]
