Skip to content

Commit

Permalink
Merge pull request #100 from alibaba/tengine-ingress-3.1.0
Browse files Browse the repository at this point in the history
HTTP Route: canary ingress without referrer is valid
  • Loading branch information
lianglli authored Oct 24, 2023
2 parents 89470a6 + 0bb2d88 commit 6e5b6ea
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion internal/checksum/ingress/apis/checksum/v1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ limitations under the License.
// +groupName=tengine.taobao.org

// Package v1 holds api types of version v1 for group "tengine.taobao.org".
package v1 // import "tengine.taobao.org/checksum/ingress/apis/checksum/v1"
package v1 // import "k8s.io/ingress-nginx/internal/checksum/ingress/apis/checksum/v1"
2 changes: 1 addition & 1 deletion internal/checksum/secret/apis/checksum/v1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ limitations under the License.
// +groupName=tengine.taobao.org

// Package v1 holds api types of version v1 for group "tengine.taobao.org".
package v1 // import "tengine.taobao.org/checksum/secret/apis/checksum/v1"
package v1 // import "k8s.io/ingress-nginx/internal/checksum/secret/apis/checksum/v1"
5 changes: 0 additions & 5 deletions internal/ingress/annotations/canary/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,5 @@ func (c canary) Parse(ing *networking.Ingress) (interface{}, error) {
return nil, errors.NewInvalidAnnotationConfiguration("canary", "configured but not enabled")
}

if config.Enabled && len(config.Referrer) == 0 {
klog.Warningf("Canary ingress[%v/%v] with empty referrer, ignored", ing.Namespace, ing.Name)
return nil, errors.NewInvalidAnnotationConfiguration("canary", "referrer is empty")
}

return config, nil
}

0 comments on commit 6e5b6ea

Please sign in to comment.