From e7c6ddef62edd0d635965f64f0891879e34cd333 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 28 Feb 2024 08:59:02 -0500 Subject: [PATCH] upgrade to latest dependencies (#453) bumping knative.dev/networking ff63078...cfb3abd: > cfb3abd upgrade to latest dependencies (# 938) > 7391d20 drop unused types (# 933) > 54694f4 upgrade to latest dependencies (# 937) bumping knative.dev/eventing 1160b45...a154f1a: > a154f1a [main] Upgrade to latest dependencies (# 7727) > 580f3c7 Assert EventTypes are ready (# 7728) bumping knative.dev/serving cb84c77...cdb41a4: > cdb41a4 Update net-certmanager nightly (# 14959) > 1c6d34f Update net-contour nightly (# 14956) > a1ad60a upgrade to latest dependencies (# 14949) > d7603f8 Update net-contour nightly (# 14953) > 6f88b3c Update net-istio nightly (# 14952) Signed-off-by: Knative Automation --- go.mod | 6 +- go.sum | 12 +- .../networking/v1alpha1/domain_defaults.go | 32 --- .../networking/v1alpha1/domain_lifecycle.go | 34 --- .../apis/networking/v1alpha1/domain_types.go | 160 ------------ .../networking/v1alpha1/domain_validation.go | 70 ------ .../networking/v1alpha1/realm_defaults.go | 32 --- .../networking/v1alpha1/realm_lifecycle.go | 34 --- .../apis/networking/v1alpha1/realm_types.go | 108 -------- .../networking/v1alpha1/realm_validation.go | 37 --- .../pkg/apis/networking/v1alpha1/register.go | 4 - .../v1alpha1/zz_generated.deepcopy.go | 230 ------------------ vendor/modules.txt | 6 +- 13 files changed, 12 insertions(+), 753 deletions(-) delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_defaults.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_lifecycle.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_types.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_validation.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_defaults.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_lifecycle.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_types.go delete mode 100644 vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_validation.go diff --git a/go.mod b/go.mod index 52fb8dfc0..316aab3e3 100644 --- a/go.mod +++ b/go.mod @@ -15,10 +15,10 @@ require ( k8s.io/api v0.29.2 k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 - knative.dev/eventing v0.40.1-0.20240226210712-1160b459345e + knative.dev/eventing v0.40.1-0.20240227172002-a154f1a7bd67 knative.dev/hack v0.0.0-20240222141347-5f0998e65262 knative.dev/pkg v0.0.0-20240227021706-97fb318ab987 - knative.dev/serving v0.40.1-0.20240227131500-cb84c7789602 + knative.dev/serving v0.40.1-0.20240228131733-cdb41a4ef760 ) require ( @@ -100,7 +100,7 @@ require ( k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect - knative.dev/networking v0.0.0-20240226064029-ff6307826d4c // indirect + knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 73777465d..28850efd8 100644 --- a/go.sum +++ b/go.sum @@ -707,16 +707,16 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.40.1-0.20240226210712-1160b459345e h1:UrT4eco1IvtaflNaulKOiH4T2yv2qQn3gdgqHhjAIAg= -knative.dev/eventing v0.40.1-0.20240226210712-1160b459345e/go.mod h1:OztSKf5bLJYwZ3VuY7pJgfTUiErnAswPHfIevYep4QM= +knative.dev/eventing v0.40.1-0.20240227172002-a154f1a7bd67 h1:1g6DdOvUPoUMT28PRRyX5EDCrqukYSjZ9WJM8dQ94tg= +knative.dev/eventing v0.40.1-0.20240227172002-a154f1a7bd67/go.mod h1:IgkzEA7CVRh8JyQLkJP84D3kO2P3R0zqx9HJ3Tcvrng= knative.dev/hack v0.0.0-20240222141347-5f0998e65262 h1:QzYYQnuTjZAHamqbVLnaoxsa1bxfhpxM2AUhdfeL6qE= knative.dev/hack v0.0.0-20240222141347-5f0998e65262/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240226064029-ff6307826d4c h1:QyiyDlkGcpegahRSeaiscLuL054eHAsHaMTpm39aQfo= -knative.dev/networking v0.0.0-20240226064029-ff6307826d4c/go.mod h1:WbE6iCBLPCUpAAyGm1UyZhhhi9++mwVoEvfGSzR/21k= +knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 h1:SkftWb1pXigIhCZJk3LI6gZLz+YqS2Qh5r4w+rI47fs= +knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62/go.mod h1:Llg1nQIqMqiMTmfKyebjCvkSjzRqqQ6Z23oyCMVla7c= knative.dev/pkg v0.0.0-20240227021706-97fb318ab987 h1:zdXI4ZgLKD+3wdHNMRTTcTxDcjuPv+IuSDIbGKcOX4g= knative.dev/pkg v0.0.0-20240227021706-97fb318ab987/go.mod h1:RcjeKl+Pv5Ufdvs8COdJEHJKutJh42yfIXILGOjy1ng= -knative.dev/serving v0.40.1-0.20240227131500-cb84c7789602 h1:TzLzcHBiO4+3Gy3hVHnxU9MY20gl2tTQSMx/rnjBbvU= -knative.dev/serving v0.40.1-0.20240227131500-cb84c7789602/go.mod h1:YUcVIPJL1/NjSX94mnI4+DhPQvZFAF+sbrvrYCs5Cqc= +knative.dev/serving v0.40.1-0.20240228131733-cdb41a4ef760 h1:9rBIE5oJm3ooFcRVN0oLGHyj3UBLerO9p0M2OfnwRWg= +knative.dev/serving v0.40.1-0.20240228131733-cdb41a4ef760/go.mod h1:4OB7epZ1JCyERJUjfnYGM+bUm4q7Sa4AbF6wlVFs7Dk= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_defaults.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_defaults.go deleted file mode 100644 index 1d3ff93c8..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_defaults.go +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "context" - - "knative.dev/pkg/apis" -) - -// SetDefaults populates default values in Domain -func (d *Domain) SetDefaults(ctx context.Context) { - d.Spec.SetDefaults(apis.WithinSpec(ctx)) -} - -// SetDefaults populates default values in DomainSpec -func (*DomainSpec) SetDefaults(_ context.Context) { -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_lifecycle.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_lifecycle.go deleted file mode 100644 index 95d16c141..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_lifecycle.go +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 The Knative Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/pkg/apis" -) - -var domainCondSet = apis.NewLivingConditionSet() - -// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface. -func (*Domain) GetConditionSet() apis.ConditionSet { - return domainCondSet -} - -// GetGroupVersionKind returns SchemeGroupVersion of an Domain -func (*Domain) GetGroupVersionKind() schema.GroupVersionKind { - return SchemeGroupVersion.WithKind("Domain") -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_types.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_types.go deleted file mode 100644 index 3296c12ab..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_types.go +++ /dev/null @@ -1,160 +0,0 @@ -/* -Copyright 2020 The Knative Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/pkg/apis" - duckv1 "knative.dev/pkg/apis/duck/v1" - "knative.dev/pkg/kmeta" -) - -// +genclient -// +genclient:nonNamespaced -// +genreconciler:krshapedlogic=true -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// Domain is a cluster-scoped resource to configure a proxy pool for a given Route. -type Domain struct { - metav1.TypeMeta `json:",inline"` - // Standard object's metadata. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata - // +optional - metav1.ObjectMeta `json:"metadata,omitempty"` - - // Spec is the desired state of the Domain. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status - // +optional - Spec DomainSpec `json:"spec,omitempty"` - - // Status is the current state of the Domain. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status - // +optional - Status DomainStatus `json:"status,omitempty"` -} - -// Verify that Domain adheres to the appropriate interfaces. -var ( - // Check that Domain may be validated and defaulted. - _ apis.Validatable = (*Domain)(nil) - _ apis.Defaultable = (*Domain)(nil) - - // Check that we can create OwnerReferences to a Domain. - _ kmeta.OwnerRefable = (*Domain)(nil) - - // Check that the type conforms to the duck Knative Resource shape. - _ duckv1.KRShaped = (*Domain)(nil) -) - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// DomainList is a collection of Domain objects. -type DomainList struct { - metav1.TypeMeta `json:",inline"` - // Standard object metadata. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata - // +optional - metav1.ListMeta `json:"metadata,omitempty"` - - // Items is the list of Domain objects. - Items []Domain `json:"items"` -} - -// DomainSpec describes the Ingress the user wishes to exist. -// -// In general this follows the same shape as K8s Ingress. -// Some notable differences: -// - Backends now can have namespace: -// - Traffic can be split across multiple backends. -// - Timeout & Retry can be configured. -// - Headers can be appended. -// DomainSpec contains the specification of the Domain CRD. -type DomainSpec struct { - // IngressClass tells what Ingress class annotation to use for Routes associated - // with this Realm. - IngressClass string `json:"ingressClass"` - - // Suffix specifies the domain suffix to be used. This field replaces the - // existing config-domain ConfigMap. Internal Domains can omit this, in - // which case we will default to the cluster suffix. - // +optional - Suffix string `json:"suffix,omitempty"` - - // LoadBalancers provide addresses (IP addresses, domains) of the load balancers - // associated with this Domain. This is used in automatic DNS provisioning like - // configuration of magic DNS or creating ExternalName services for cluster-local - // access. - LoadBalancers []LoadBalancerIngressSpec `json:"loadBalancers"` - - // Configs contains additional pieces of information to configure ingress proxies. - // +optional - Configs []IngressConfig `json:"configs,omitempty"` -} - -// IngressConfig allows KIngress implementations to add additional information needed -// for configuring the proxies associated with this Domain. -// For examples, in our Istio-based Ingress this will contains all references of -// Istio Gateways associated with this Domain. This could be a reference of a ConfigMap -// owned by the implementation as well. -type IngressConfig struct { - // Name of the Kingress implementation resource - // +optional - Name string `json:"name,omitempty"` - // Namespace of the Kingress implementation resource - // +optional - Namespace string `json:"namespace,omitempty"` - // Type of the Kingress implementation resource - // +optional - Type string `json:"type,omitempty"` -} - -// LoadBalancerIngressSpec represents the spec of a load-balancer ingress point: -// traffic intended for the service should be sent to an ingress point. -type LoadBalancerIngressSpec struct { - // IP is set for load-balancer ingress points that are IP based - // (typically GCE or OpenStack load-balancers) - // +optional - IP string `json:"ip,omitempty"` - - // Domain is set for load-balancer ingress points that are DNS based - // (typically AWS load-balancers) - // +optional - Domain string `json:"domain,omitempty"` - - // DomainInternal is set if there is a cluster-local DNS name to access the Ingress. - // - // NOTE: This differs from K8s Ingress, since we also desire to have a cluster-local - // DNS name to allow routing in case of not having a mesh. - // - // +optional - DomainInternal string `json:"domainInternal,omitempty"` - - // MeshOnly is set if the Ingress is only load-balanced through a Service mesh. - // +optional - MeshOnly bool `json:"meshOnly,omitempty"` -} - -// DomainStatus will reflect Ready=True if the implementation accepts the Domain data -// as valid. -type DomainStatus struct { - duckv1.Status `json:",inline"` -} - -// GetStatus retrieves the status of the Domain. Implements the KRShaped interface. -func (d *Domain) GetStatus() *duckv1.Status { - return &d.Status.Status -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_validation.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_validation.go deleted file mode 100644 index 85d556972..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/domain_validation.go +++ /dev/null @@ -1,70 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "context" - - "k8s.io/apimachinery/pkg/api/equality" - "knative.dev/pkg/apis" -) - -// Validate inspects and validates Domain object. -func (d *Domain) Validate(ctx context.Context) *apis.FieldError { - return d.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec") -} - -// Validate inspects and validates DomainSpec object. -func (ds *DomainSpec) Validate(ctx context.Context) *apis.FieldError { - // Spec must not be empty. - if equality.Semantic.DeepEqual(ds, &DomainSpec{}) { - return apis.ErrMissingField(apis.CurrentField) - } - var all *apis.FieldError - if ds.IngressClass == "" { - all = all.Also(apis.ErrMissingField("ingressClass")) - } - if len(ds.LoadBalancers) == 0 { - all = all.Also(apis.ErrMissingField("loadBalancers")) - } - for idx, lbSpec := range ds.LoadBalancers { - all = all.Also(lbSpec.Validate(ctx).ViaFieldIndex("loadBalancers", idx)) - } - for idx, cfg := range ds.Configs { - all = all.Also(cfg.Validate(ctx).ViaFieldIndex("configs", idx)) - } - return all -} - -func (lb *LoadBalancerIngressSpec) Validate(_ context.Context) *apis.FieldError { - var all *apis.FieldError - if lb.Domain == "" && lb.DomainInternal == "" && lb.IP == "" && !lb.MeshOnly { - return all.Also(apis.ErrMissingOneOf("domain", "domainInternal", "ip", "meshOnly")) - } - return all -} - -func (cfg *IngressConfig) Validate(_ context.Context) *apis.FieldError { - var all *apis.FieldError - if cfg.Name == "" { - all = all.Also(apis.ErrMissingField("name")) - } - if cfg.Type == "" { - all = all.Also(apis.ErrMissingField("type")) - } - return all -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_defaults.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_defaults.go deleted file mode 100644 index 5614104be..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_defaults.go +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "context" - - "knative.dev/pkg/apis" -) - -// SetDefaults populates default values in Realm -func (r *Realm) SetDefaults(ctx context.Context) { - r.Spec.SetDefaults(apis.WithinSpec(ctx)) -} - -// SetDefaults populates default values in RealmSpec -func (*RealmSpec) SetDefaults(_ context.Context) { -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_lifecycle.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_lifecycle.go deleted file mode 100644 index e53df392c..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_lifecycle.go +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 The Knative Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/pkg/apis" -) - -var realmCondSet = apis.NewLivingConditionSet() - -// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface. -func (*Realm) GetConditionSet() apis.ConditionSet { - return realmCondSet -} - -// GetGroupVersionKind returns SchemeGroupVersion of an Realm -func (*Realm) GetGroupVersionKind() schema.GroupVersionKind { - return SchemeGroupVersion.WithKind("Realm") -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_types.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_types.go deleted file mode 100644 index bfb2df920..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_types.go +++ /dev/null @@ -1,108 +0,0 @@ -/* -Copyright 2020 The Knative Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/pkg/apis" - duckv1 "knative.dev/pkg/apis/duck/v1" - "knative.dev/pkg/kmeta" -) - -// +genclient -// +genclient:nonNamespaced -// +genreconciler:krshapedlogic=true -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// Realm is a cluster-scoped resource that specifies a Route visibility. -type Realm struct { - metav1.TypeMeta `json:",inline"` - // Standard object's metadata. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata - // +optional - metav1.ObjectMeta `json:"metadata,omitempty"` - - // Spec is the desired state of the Realm. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status - // +optional - Spec RealmSpec `json:"spec,omitempty"` - - // Status is the current state of the Realm. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status - // +optional - Status RealmStatus `json:"status,omitempty"` -} - -// Verify that Realm adheres to the appropriate interfaces. -var ( - // Check that Realm may be validated and defaulted. - _ apis.Validatable = (*Realm)(nil) - _ apis.Defaultable = (*Realm)(nil) - - // Check that we can create OwnerReferences to a Realm. - _ kmeta.OwnerRefable = (*Realm)(nil) - - // Check that the type conforms to the duck Knative Resource shape. - _ duckv1.KRShaped = (*Realm)(nil) -) - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// RealmList is a collection of Realm objects. -type RealmList struct { - metav1.TypeMeta `json:",inline"` - // Standard object metadata. - // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata - // +optional - metav1.ListMeta `json:"metadata,omitempty"` - - // Items is the list of Realm objects. - Items []Realm `json:"items"` -} - -// RealmSpec defines the specifications of a Realm. -// Realms specify an internal and external Domain, but disallow arbitrary combinations. -// Operators can create combinations of Domains that makes sense for their clusters, -// and developers can only switch between these predefined Realms. -// -// Conditions: Currently each Realm can have only two Domains. -// That fits well with the way we assign Route.Status.URL and Route.Status.Domain. -// All Domains in the same Realm must share the same ingress class annotation. -type RealmSpec struct { - // External contains the name of the Domain resource corresponding with traffic - // originating from outside of the cluster. Could be omitted for a Realm without - // external access. - // +optional - External string `json:"external,omitempty"` - - // Internal contains the name of the Domain resource corresponding with traffic - // originating from inside of the cluster. Could be omitted for a Realm without - // internal access. - // +optional - Internal string `json:"internal,omitempty"` -} - -// RealmStatus will reflect Ready=True if the implementation accepts the Realm data -// as valid. -type RealmStatus struct { - duckv1.Status `json:",inline"` -} - -// GetStatus retrieves the status of the Realm. Implements the KRShaped interface. -func (r *Realm) GetStatus() *duckv1.Status { - return &r.Status.Status -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_validation.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_validation.go deleted file mode 100644 index 93caf7016..000000000 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/realm_validation.go +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "context" - - "knative.dev/pkg/apis" -) - -// Validate inspects and validates Realm object. -func (r *Realm) Validate(ctx context.Context) *apis.FieldError { - return r.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec") -} - -// Validate inspects and validates RealmSpec object. -func (rs *RealmSpec) Validate(_ context.Context) *apis.FieldError { - var all *apis.FieldError - if rs.External == "" && rs.Internal == "" { - all = all.Also(apis.ErrMissingOneOf("external", "internal")) - } - return all -} diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/register.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/register.go index 19a1b907f..6d54c4e6a 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/register.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/register.go @@ -46,12 +46,8 @@ var ( // Adds the list of known types to Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &Domain{}, - &DomainList{}, &Ingress{}, &IngressList{}, - &Realm{}, - &RealmList{}, &ServerlessService{}, &ServerlessServiceList{}, &Certificate{}, diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/zz_generated.deepcopy.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/zz_generated.deepcopy.go index 7f93cd337..64bf6351b 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/zz_generated.deepcopy.go @@ -213,110 +213,6 @@ func (in *ClusterDomainClaimSpec) DeepCopy() *ClusterDomainClaimSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Domain) DeepCopyInto(out *Domain) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Domain. -func (in *Domain) DeepCopy() *Domain { - if in == nil { - return nil - } - out := new(Domain) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Domain) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DomainList) DeepCopyInto(out *DomainList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Domain, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DomainList. -func (in *DomainList) DeepCopy() *DomainList { - if in == nil { - return nil - } - out := new(DomainList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DomainList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DomainSpec) DeepCopyInto(out *DomainSpec) { - *out = *in - if in.LoadBalancers != nil { - in, out := &in.LoadBalancers, &out.LoadBalancers - *out = make([]LoadBalancerIngressSpec, len(*in)) - copy(*out, *in) - } - if in.Configs != nil { - in, out := &in.Configs, &out.Configs - *out = make([]IngressConfig, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DomainSpec. -func (in *DomainSpec) DeepCopy() *DomainSpec { - if in == nil { - return nil - } - out := new(DomainSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DomainStatus) DeepCopyInto(out *DomainStatus) { - *out = *in - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DomainStatus. -func (in *DomainStatus) DeepCopy() *DomainStatus { - if in == nil { - return nil - } - out := new(DomainStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HTTP01Challenge) DeepCopyInto(out *HTTP01Challenge) { *out = *in @@ -505,22 +401,6 @@ func (in *IngressBackendSplit) DeepCopy() *IngressBackendSplit { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *IngressConfig) DeepCopyInto(out *IngressConfig) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressConfig. -func (in *IngressConfig) DeepCopy() *IngressConfig { - if in == nil { - return nil - } - out := new(IngressConfig) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IngressList) DeepCopyInto(out *IngressList) { *out = *in @@ -658,22 +538,6 @@ func (in *IngressTLS) DeepCopy() *IngressTLS { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LoadBalancerIngressSpec) DeepCopyInto(out *LoadBalancerIngressSpec) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LoadBalancerIngressSpec. -func (in *LoadBalancerIngressSpec) DeepCopy() *LoadBalancerIngressSpec { - if in == nil { - return nil - } - out := new(LoadBalancerIngressSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LoadBalancerIngressStatus) DeepCopyInto(out *LoadBalancerIngressStatus) { *out = *in @@ -711,100 +575,6 @@ func (in *LoadBalancerStatus) DeepCopy() *LoadBalancerStatus { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Realm) DeepCopyInto(out *Realm) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Realm. -func (in *Realm) DeepCopy() *Realm { - if in == nil { - return nil - } - out := new(Realm) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Realm) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RealmList) DeepCopyInto(out *RealmList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Realm, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RealmList. -func (in *RealmList) DeepCopy() *RealmList { - if in == nil { - return nil - } - out := new(RealmList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *RealmList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RealmSpec) DeepCopyInto(out *RealmSpec) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RealmSpec. -func (in *RealmSpec) DeepCopy() *RealmSpec { - if in == nil { - return nil - } - out := new(RealmSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RealmStatus) DeepCopyInto(out *RealmStatus) { - *out = *in - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RealmStatus. -func (in *RealmStatus) DeepCopy() *RealmStatus { - if in == nil { - return nil - } - out := new(RealmStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServerlessService) DeepCopyInto(out *ServerlessService) { *out = *in diff --git a/vendor/modules.txt b/vendor/modules.txt index 700e711bb..61ef168d1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -951,7 +951,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.40.1-0.20240226210712-1160b459345e +# knative.dev/eventing v0.40.1-0.20240227172002-a154f1a7bd67 ## explicit; go 1.21 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/test @@ -968,7 +968,7 @@ knative.dev/eventing/pkg/reconciler/source # knative.dev/hack v0.0.0-20240222141347-5f0998e65262 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240226064029-ff6307826d4c +# knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 ## explicit; go 1.21 knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 @@ -1036,7 +1036,7 @@ knative.dev/pkg/webhook/psbinding knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/serving v0.40.1-0.20240227131500-cb84c7789602 +# knative.dev/serving v0.40.1-0.20240228131733-cdb41a4ef760 ## explicit; go 1.21 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1