Skip to content

Commit 120186e

Browse files
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent 26b9e69 commit 120186e

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

api/v2/reason.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
// Licensed under the Apache License, Version 2.0 (the "License");
2+
// you may not use this file except in compliance with the License.
3+
// You may obtain a copy of the License at
4+
//
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
//
7+
// Unless required by applicable law or agreed to in writing, software
8+
// distributed under the License is distributed on an "AS IS" BASIS,
9+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
// See the License for the specific language governing permissions and
11+
// limitations under the License.
12+
113
package v2
214

315
type Reason string

docs/crd/api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,6 +1632,8 @@ them if they are set on the port level.
16321632
_Appears in:_
16331633
- [ApisixUpstreamSpec](#apisixupstreamspec)
16341634

1635+
1636+
16351637
#### UpstreamTimeout
16361638

16371639

internal/controller/apisixglobalrule_controller.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apimachinery/pkg/types"
27-
"k8s.io/utils/ptr"
2827
ctrl "sigs.k8s.io/controller-runtime"
2928
"sigs.k8s.io/controller-runtime/pkg/builder"
3029
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -86,12 +85,6 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
8685
return ctrl.Result{}, err
8786
}
8887

89-
tctx.RouteParentRefs = append(tctx.RouteParentRefs, gatewayv1.ParentReference{
90-
Group: ptr.To(gatewayv1.Group(ingressClass.GroupVersionKind().Group)),
91-
Kind: ptr.To(gatewayv1.Kind(KindIngressClass)),
92-
Name: gatewayv1.ObjectName(ingressClass.Name),
93-
})
94-
9588
// process IngressClass parameters if they reference GatewayProxy
9689
if err := r.processIngressClassParameters(ctx, tctx, &globalRule, ingressClass); err != nil {
9790
log.Error(err, "failed to process IngressClass parameters", "ingressClass", ingressClass.Name)

0 commit comments

Comments
 (0)