Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/serving 3e6d275...c3f2bfe:
  > c3f2bfe Exclude kourier tls runtime (# 15696)
  > b484fa2 Update net-contour nightly (# 15691)
  > a829571 Update net-kourier nightly (# 15689)
  > 19b9a09 Fix all linter warnings (# 15684)
  > db2721f Update net-gateway-api nightly (# 15690)
  > 243e1ea upgrade to latest dependencies (# 15687)
  > dd48437 Bump the github-actions group with 3 updates (# 15686)
bumping knative.dev/networking 22a6457...6797968:
  > 6797968 upgrade to latest dependencies (# 1037)
  > 402ac60 drop unnecessary external name svc (# 1029)
  > 47d62db fix grpc dialing (# 1036)
  > 9d4838b upgrade to latest dependencies (# 1035)
bumping knative.dev/caching 634555c...dee364d:
  > dee364d upgrade to latest dependencies (# 914)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation committed Jan 16, 2025
1 parent 316aa10 commit f974ce6
Show file tree
Hide file tree
Showing 29 changed files with 72 additions and 89 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ require (
k8s.io/apimachinery v0.31.4
k8s.io/client-go v0.31.4
k8s.io/code-generator v0.31.4
knative.dev/caching v0.0.0-20250113172401-634555c68ceb
knative.dev/caching v0.0.0-20250113195200-dee364dbb0f7
knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d
knative.dev/hack v0.0.0-20250109131303-f8be0ccdff36
knative.dev/pkg v0.0.0-20250113161000-0c2a238a16ed
knative.dev/reconciler-test v0.0.0-20250109131538-359287e93238
knative.dev/serving v0.43.1-0.20250113163001-3e6d275e2bc4
knative.dev/serving v0.43.1-0.20250115173903-c3f2bfe4c93e
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -156,7 +156,7 @@ require (
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
knative.dev/networking v0.0.0-20250110153017-22a6457498e8 // indirect
knative.dev/networking v0.0.0-20250113195501-679796878afc // indirect
sigs.k8s.io/controller-runtime v0.7.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1400,20 +1400,20 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20250113172401-634555c68ceb h1:9Tdlb4RhC4l7SRW3A47ZSUAqgr7ih53cINTraoIHRkE=
knative.dev/caching v0.0.0-20250113172401-634555c68ceb/go.mod h1:XifurIHfoPIJocfQJtDJm4st9QPOhjpXprVgp/uSU8o=
knative.dev/caching v0.0.0-20250113195200-dee364dbb0f7 h1:CR9A/ideKIXAf7xD4H7lMOo1H+kVeIv9DT5kn5qOutM=
knative.dev/caching v0.0.0-20250113195200-dee364dbb0f7/go.mod h1:gKaakWRBpk42miAe4eDxjJfS5i/Z/ldB3cKRoOadLX8=
knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d h1:H6TfOTcG/81nciBfim8+16cxSMFjqchG65yDYuW2RqE=
knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d/go.mod h1:mDuDRRofBF46zRsZq3lyChuMTE+qqcrIqGHP4E09wtY=
knative.dev/hack v0.0.0-20250109131303-f8be0ccdff36 h1:iZ6CwYLo+y82MXlK7PoG/cnFEB0tRdw8elBXj6c6ezE=
knative.dev/hack v0.0.0-20250109131303-f8be0ccdff36/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/networking v0.0.0-20250110153017-22a6457498e8 h1:ZqqTlzVZzl7PivB6HL3ebwKEQkdGYNVwtgW87UHUR4U=
knative.dev/networking v0.0.0-20250110153017-22a6457498e8/go.mod h1:TH55M/KfH3o886FQodc6WTLq7mAFvIXWTwxD4j8YKWY=
knative.dev/networking v0.0.0-20250113195501-679796878afc h1:bzQlBSOXd7Uz+/ugX8bed6I6pbbWNgAuax1NT6DHqaU=
knative.dev/networking v0.0.0-20250113195501-679796878afc/go.mod h1:Coz36qc6dZK219RRTPuzQf4YTrCjoqN5T2hcr14RNfI=
knative.dev/pkg v0.0.0-20250113161000-0c2a238a16ed h1:PUMNZc1CBUg5G4JYio3wjpCJuCJG2ZeCuLvlBTpDiZI=
knative.dev/pkg v0.0.0-20250113161000-0c2a238a16ed/go.mod h1:p7c7yCCf1YVX04FQ8YDyJaHciknu726qVWOXRX5tIBM=
knative.dev/reconciler-test v0.0.0-20250109131538-359287e93238 h1:qGRLFIcJ9quJb9MglIyMk3SUMCey7esVl2idt1G7cNk=
knative.dev/reconciler-test v0.0.0-20250109131538-359287e93238/go.mod h1:QqV6rbJjHwh28XJXlG5l2pFU5qCQzBMngw6sKAlDoMA=
knative.dev/serving v0.43.1-0.20250113163001-3e6d275e2bc4 h1:khvS0c6FTsz7Rrto0YzNMiqHYvzNWW5STDhu/G/aMlE=
knative.dev/serving v0.43.1-0.20250113163001-3e6d275e2bc4/go.mod h1:r6fkQURyTwcCiu/4dXFJbCW/Jp+lPUO9ULCARdTYjT8=
knative.dev/serving v0.43.1-0.20250115173903-c3f2bfe4c93e h1:TzPT4p9EriDZ3rNpnaHNk4CUEkqqPlrljziTWnndjUE=
knative.dev/serving v0.43.1-0.20250115173903-c3f2bfe4c93e/go.mod h1:idwHPJ+HPW8/RPna8J2lQfkNQsYaWa7Y5K4bm6pJkDE=
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ func validateInitialScale(config *autoscalerconfig.Config, m map[string]string)
if err != nil {
return apis.ErrInvalidValue(v, k)
} else if initScaleInt < 0 {
return apis.ErrInvalidValue(v, fmt.Sprintf("%s must be greater than 0", k))
return apis.ErrInvalidValue(v, k+" must be greater than 0")
} else if !config.AllowZeroInitialScale && initScaleInt == 0 {
return apis.ErrInvalidValue(v, fmt.Sprintf("%s=0 not allowed by cluster", k))
return apis.ErrInvalidValue(v, k+"=0 not allowed by cluster")
}
}
return nil
Expand Down
2 changes: 0 additions & 2 deletions vendor/knative.dev/serving/pkg/apis/autoscaling/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ const (
// points will be missed entirely by the panic window which is
// smaller than the stable window. Anything less than 6 seconds
// isn't going to work well.
//
// nolint:revive // False positive, Min means minimum, not minutes.
WindowMin = 6 * time.Second
// WindowMax is the maximum permitted stable autoscaling window.
// This keeps the event horizon to a reasonable enough limit.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ type PodScalableStatus struct {
Replicas int32 `json:"replicas,omitempty"`
}

var _ duck.Populatable = (*PodScalable)(nil)
var _ duck.Implementable = (*PodScalable)(nil)
var _ apis.Listable = (*PodScalable)(nil)
var (
_ duck.Populatable = (*PodScalable)(nil)
_ duck.Implementable = (*PodScalable)(nil)
_ apis.Listable = (*PodScalable)(nil)
)

// GetFullType implements duck.Implementable
func (*PodScalable) GetFullType() duck.Populatable {
Expand Down
8 changes: 1 addition & 7 deletions vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ func HandlerMask(in *corev1.ProbeHandler) *corev1.ProbeHandler {
out.GRPC = in.GRPC

return out

}

// ExecActionMask performs a _shallow_ copy of the Kubernetes ExecAction object to a new
Expand Down Expand Up @@ -473,7 +472,7 @@ func ContainerPortMask(in *corev1.ContainerPort) *corev1.ContainerPort {
out.Name = in.Name
out.Protocol = in.Protocol

//Disallowed fields
// Disallowed fields
// This list is unnecessary, but added here for clarity
out.HostIP = ""
out.HostPort = 0
Expand Down Expand Up @@ -552,7 +551,6 @@ func ConfigMapKeySelectorMask(in *corev1.ConfigMapKeySelector) *corev1.ConfigMap
out.LocalObjectReference = in.LocalObjectReference

return out

}

// SecretKeySelectorMask performs a _shallow_ copy of the Kubernetes SecretKeySelector object to a new
Expand All @@ -571,7 +569,6 @@ func SecretKeySelectorMask(in *corev1.SecretKeySelector) *corev1.SecretKeySelect
out.LocalObjectReference = in.LocalObjectReference

return out

}

// ConfigMapEnvSourceMask performs a _shallow_ copy of the Kubernetes ConfigMapEnvSource object to a new
Expand All @@ -589,7 +586,6 @@ func ConfigMapEnvSourceMask(in *corev1.ConfigMapEnvSource) *corev1.ConfigMapEnvS
out.LocalObjectReference = in.LocalObjectReference

return out

}

// SecretEnvSourceMask performs a _shallow_ copy of the Kubernetes SecretEnvSource object to a new
Expand All @@ -607,7 +603,6 @@ func SecretEnvSourceMask(in *corev1.SecretEnvSource) *corev1.SecretEnvSource {
out.LocalObjectReference = in.LocalObjectReference

return out

}

// EnvFromSourceMask performs a _shallow_ copy of the Kubernetes EnvFromSource object to a new
Expand Down Expand Up @@ -643,7 +638,6 @@ func ResourceRequirementsMask(in *corev1.ResourceRequirements) *corev1.ResourceR
out.Requests = in.Requests

return out

}

// PodSecurityContextMask performs a _shallow_ copy of the Kubernetes PodSecurityContext object into a new
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func TransformDeploymentStatus(ds *appsv1.DeploymentStatus) *duckv1.Status {
depCondSet.Manage(s).MarkTrue(DeploymentConditionReplicaSetReady)
}
}

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

//nolint:stylecheck // ignore complaints about receiver having different names
package v1

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

//nolint:stylecheck // ignore complaints about receiver having different names
package v1

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,8 @@ func validateQueueSidecarResourceAnnotations(m map[string]string) *apis.FieldErr
value, err := strconv.ParseFloat(v, 64)
if err != nil {
errs = errs.Also(apis.ErrInvalidValue(v, apis.CurrentField).ViaKey(k))
} else {
if value < 0.1 || value > 100 {
errs = errs.Also(apis.ErrOutOfBoundsValue(value, 0.1, 100.0, apis.CurrentField).ViaKey(k))
}
} else if value < 0.1 || value > 100 {
errs = errs.Also(apis.ErrOutOfBoundsValue(value, 0.1, 100.0, apis.CurrentField).ViaKey(k))
}
}
annoKeys := []kmap.KeyPriority{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

//nolint:stylecheck // ignore complaints about receiver having different names
package v1

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

//nolint:stylecheck // ignore complaints about receiver having different names
package v1

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func (s *Service) SetDefaults(ctx context.Context) {

s.Spec.SetDefaults(apis.WithinSpec(ctx))
serving.SetUserInfo(ctx, prevSpec, &s.Spec, s)

}

// SetDefaults implements apis.Defaultable
Expand Down
1 change: 0 additions & 1 deletion vendor/knative.dev/serving/pkg/autoscaler/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ func validate(lc *autoscalerconfig.Config) (*autoscalerconfig.Config, error) {
lc.PanicWindowPercentage > autoscaling.PanicWindowPercentageMax {
return nil, fmt.Errorf("panic-window-percentage = %v, must be in [%v, %v] interval",
lc.PanicWindowPercentage, autoscaling.PanicWindowPercentageMin, autoscaling.PanicWindowPercentageMax)

}

if lc.InitialScale < 0 || (lc.InitialScale == 0 && !lc.AllowZeroInitialScale) {
Expand Down
7 changes: 6 additions & 1 deletion vendor/knative.dev/serving/pkg/gc/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package gc

import (
"context"
"errors"
"fmt"
"math"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -111,6 +113,9 @@ func parseDisabledOrInt64(val string, toSet *int64) error {
if err != nil {
return err
}
if parsed > math.MaxInt64 {
return fmt.Errorf("value should be lower than %v", math.MaxInt64)
}
*toSet = int64(parsed)
}
return nil
Expand All @@ -128,7 +133,7 @@ func parseDisabledOrDuration(val string, toSet *time.Duration) error {
return err
}
if parsed < 0 {
return fmt.Errorf("must be non-negative")
return errors.New("must be non-negative")
}
*toSet = parsed
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/knative.dev/serving/pkg/networking/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package networking

import (
"context"
"fmt"
"errors"
"strings"

"knative.dev/networking/pkg/apis/networking"
Expand All @@ -22,7 +22,7 @@ func GetHTTPOption(ctx context.Context, networkConfig *netcfg.Config, annotation
case netcfg.HTTPRedirected:
return netv1alpha1.HTTPOptionRedirected, nil
default:
return "", fmt.Errorf("incorrect http-protocol annotation: " + protocol)
return "", errors.New("incorrect http-protocol annotation: " + protocol)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ const (
DomainTypeWildcard = "wildcard"
)

var (
// DefaultDomain holds the domain that Route's live under by default
// when no label selector-based options apply.
DefaultDomain = "svc." + network.GetClusterDomainName()
)
// DefaultDomain holds the domain that Route's live under by default
// when no label selector-based options apply.
var DefaultDomain = "svc." + network.GetClusterDomainName()

// LabelSelector represents map of {key,value} pairs. A single {key,value} in the
// map is equivalent to a requirement key == value. The requirements are ANDed.
Expand Down Expand Up @@ -131,7 +129,6 @@ func (c *Domain) LookupDomainForLabels(labels map[string]string) string {
return "svc." + network.GetClusterDomainName()
}
for k, v := range c.Domains {

// Ignore if selector doesn't match, or decrease the specificity.
if !v.Selector.Matches(labels) || v.Selector.specificity() < specificity {
continue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ import (
// HTTPScheme is the string representation of http.
const HTTPScheme string = "http"

var (
ErrorDomainName = errors.New("domain name error")
)
var ErrDomainName = errors.New("domain name error")

// GetAllDomainsAndTags returns all of the domains and tags(including subdomains) associated with a Route
func GetAllDomainsAndTags(ctx context.Context, r *v1.Route, names []string, visibility map[string]netv1alpha1.IngressVisibility) (map[string]string, error) {
Expand Down Expand Up @@ -124,12 +122,12 @@ func DomainNameFromTemplate(ctx context.Context, r metav1.ObjectMeta, name strin
}

if err := templ.Execute(&buf, data); err != nil {
return "", fmt.Errorf("%w: error executing the DomainTemplate: %w", ErrorDomainName, err)
return "", fmt.Errorf("%w: error executing the DomainTemplate: %w", ErrDomainName, err)
}

urlErrs := validation.IsFullyQualifiedDomainName(field.NewPath("url"), buf.String())
if urlErrs != nil {
return "", fmt.Errorf("%w: invalid domain name %q: %w", ErrorDomainName, buf.String(), urlErrs.ToAggregate())
return "", fmt.Errorf("%w: invalid domain name %q: %w", ErrDomainName, buf.String(), urlErrs.ToAggregate())
}

return buf.String(), nil
Expand All @@ -152,7 +150,7 @@ func HostnameFromTemplate(ctx context.Context, name, tag string) (string, error)
networkConfig := config.FromContext(ctx).Network
buf := bytes.Buffer{}
if err := networkConfig.GetTagTemplate().Execute(&buf, data); err != nil {
return "", fmt.Errorf("%w: error executing the TagTemplate: %w", ErrorDomainName, err)
return "", fmt.Errorf("%w: error executing the TagTemplate: %w", ErrDomainName, err)
}
return buf.String(), nil
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/knative.dev/serving/pkg/testing/v1/revision.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ func WithRevisionPVC() RevisionOption {
VolumeSource: corev1.VolumeSource{PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
ClaimName: "myclaim",
ReadOnly: false,
}}},
}
}},
}}
r.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{{
Name: "claimvolume",
MountPath: "/data",
Expand Down
24 changes: 11 additions & 13 deletions vendor/knative.dev/serving/pkg/testing/v1/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -502,21 +502,19 @@ func WithFailedConfig(name, reason, message string) ServiceOption {
}
}

var (
// configSpec is the spec used for the different styles of Service rollout.
configSpec = v1.ConfigurationSpec{
Template: v1.RevisionTemplateSpec{
Spec: v1.RevisionSpec{
TimeoutSeconds: ptr.Int64(60),
PodSpec: corev1.PodSpec{
Containers: []corev1.Container{{
Image: "busybox",
}},
},
// configSpec is the spec used for the different styles of Service rollout.
var configSpec = v1.ConfigurationSpec{
Template: v1.RevisionTemplateSpec{
Spec: v1.RevisionSpec{
TimeoutSeconds: ptr.Int64(60),
PodSpec: corev1.PodSpec{
Containers: []corev1.Container{{
Image: "busybox",
}},
},
},
}
)
},
}

// WithInitContainer adds init container to a service.
func WithInitContainer(p corev1.Container) ServiceOption {
Expand Down
Loading

0 comments on commit f974ce6

Please sign in to comment.