diff --git a/go.mod b/go.mod index 4653ec428..a5ef21482 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,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.42.1-0.20240730184929-a9abf3ce4624 - knative.dev/hack v0.0.0-20240730131549-0a23232167bc + knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f + knative.dev/hack v0.0.0-20240801232131-441a19fc9ead knative.dev/pkg v0.0.0-20240730131544-0e7ffe491d5e - knative.dev/serving v0.42.1-0.20240731122010-5225d4f557f4 + knative.dev/serving v0.42.1-0.20240801154043-2b86c14394f7 ) require ( diff --git a/go.sum b/go.sum index 87ba0fae2..6c20e96ef 100644 --- a/go.sum +++ b/go.sum @@ -789,16 +789,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.42.1-0.20240730184929-a9abf3ce4624 h1:4GFLiCit+NWZzpybNxU/ziFN3+WDCn0Z002GwxTV9Mg= -knative.dev/eventing v0.42.1-0.20240730184929-a9abf3ce4624/go.mod h1:sW8btFd57JF2hS2T92Jh/k1PgSOVTQdPzZODXaQs54E= -knative.dev/hack v0.0.0-20240730131549-0a23232167bc h1:Dl+DvyH7quVCP7FPNVii9Md+EuYgdsH43RFBp4jvMwc= -knative.dev/hack v0.0.0-20240730131549-0a23232167bc/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f h1:nxcX0qPKzBc/n+gFEhT2sWTnT5xbRdx1QH8TPsXMxqM= +knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f/go.mod h1:sW8btFd57JF2hS2T92Jh/k1PgSOVTQdPzZODXaQs54E= +knative.dev/hack v0.0.0-20240801232131-441a19fc9ead h1:ViH1OEO0LViKa6W61YKUpLzOp7CJCFL9yLyIojHIuQ8= +knative.dev/hack v0.0.0-20240801232131-441a19fc9ead/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= knative.dev/networking v0.0.0-20240730152525-543181c32243 h1:LD1SBebiWctT3NUTVAHcgoHYzvXeWdkgn/JfgMF2OaU= knative.dev/networking v0.0.0-20240730152525-543181c32243/go.mod h1:bBdtfiQEMV4F3nET1NxS8OqERgo7K5DLiHDcNlXXjBw= knative.dev/pkg v0.0.0-20240730131544-0e7ffe491d5e h1:pRbTdwG1ePdAJ+8mwFbtsY5gKFBaF+299QgY8BRn+ng= knative.dev/pkg v0.0.0-20240730131544-0e7ffe491d5e/go.mod h1:wQoeURvX7/oMI5ZcNowGGIX4cmOUzew1cyNf3KRZdFE= -knative.dev/serving v0.42.1-0.20240731122010-5225d4f557f4 h1:+Kkzr3dDDAk5VcAh4R3lx1p5FTk1zAx5gBERfiAVMzE= -knative.dev/serving v0.42.1-0.20240731122010-5225d4f557f4/go.mod h1:0m3iOOYT/gSq39nhZTIPHmEwjSGyLYH/h3wz4J8OErw= +knative.dev/serving v0.42.1-0.20240801154043-2b86c14394f7 h1:LsDLuvWsQaKDZ6JmxUfa1/N3t2+I4ePwIDy+/cWAGOA= +knative.dev/serving v0.42.1-0.20240801154043-2b86c14394f7/go.mod h1:0m3iOOYT/gSq39nhZTIPHmEwjSGyLYH/h3wz4J8OErw= 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/hack/release.sh b/vendor/knative.dev/hack/release.sh index 7c5c2ba52..5cc8f3235 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -33,36 +33,12 @@ readonly RELEASE_GCR="gcr.io/knative-releases/github.com/${ORG_NAME}/${REPO_NAME readonly NIGHTLY_SIGNING_IDENTITY="signer@knative-nightly.iam.gserviceaccount.com" readonly RELEASE_SIGNING_IDENTITY="signer@knative-releases.iam.gserviceaccount.com" -# Georeplicate images to {us,eu,asia}.gcr.io -readonly GEO_REPLICATION=(us eu asia) - # Simple banner for logging purposes. # Parameters: $* - message to display. function banner() { subheader "$*" } -# Tag images in the yaml files if $TAG is not empty. -# $KO_DOCKER_REPO is the registry containing the images to tag with $TAG. -# Parameters: $1..$n - files to parse for images (non .yaml files are ignored). -function tag_images_in_yamls() { - [[ -z ${TAG} ]] && return 0 - local SRC_DIR="${GOPATH}/src/" - local DOCKER_BASE="${KO_DOCKER_REPO}/${REPO_ROOT_DIR/$SRC_DIR}" - local GEO_REGIONS="${GEO_REPLICATION[@]} " - echo "Tagging any images under '${DOCKER_BASE}' with ${TAG}" - # shellcheck disable=SC2068 - for file in $@; do - [[ "${file##*.}" != "yaml" ]] && continue - echo "Inspecting ${file}" - for image in $(grep -o "${DOCKER_BASE}/[a-z\./-]\+@sha256:[0-9a-f]\+" "${file}"); do - for region in "" ${GEO_REGIONS// /. }; do - gcloud -q container images add-tag "${image}" "${region}${image%%@*}:${TAG}" - done - done - done -} - # Copy the given files to the $RELEASE_GCS_BUCKET bucket's "latest" directory. # If $TAG is not empty, also copy them to $RELEASE_GCS_BUCKET bucket's "previous" directory. # Parameters: $1..$n - files to copy. @@ -646,7 +622,6 @@ function run_validation_tests() { # Parameters: $1..$n - files to add to the release. function publish_artifacts() { (( ! PUBLISH_RELEASE )) && return - tag_images_in_yamls "${ARTIFACTS_TO_PUBLISH}" if [[ -n "${RELEASE_DIR}" ]]; then cp "${ARTIFACTS_TO_PUBLISH}" "${RELEASE_DIR}" || abort "cannot copy release to '${RELEASE_DIR}'" fi diff --git a/vendor/knative.dev/serving/pkg/apis/config/features.go b/vendor/knative.dev/serving/pkg/apis/config/features.go index 63234c30e..57b0bbe49 100644 --- a/vendor/knative.dev/serving/pkg/apis/config/features.go +++ b/vendor/knative.dev/serving/pkg/apis/config/features.go @@ -64,6 +64,9 @@ func defaultFeaturesConfig() *Features { PodSpecRuntimeClassName: Disabled, PodSpecSecurityContext: Disabled, PodSpecShareProcessNamespace: Disabled, + PodSpecHostIPC: Disabled, + PodSpecHostPID: Disabled, + PodSpecHostNetwork: Disabled, PodSpecPriorityClassName: Disabled, PodSpecSchedulerName: Disabled, ContainerSpecAddCapabilities: Disabled, @@ -98,11 +101,15 @@ func NewFeaturesConfigFromMap(data map[string]string) (*Features, error) { asFlag("kubernetes.podspec-runtimeclassname", &nc.PodSpecRuntimeClassName), asFlag("kubernetes.podspec-securitycontext", &nc.PodSpecSecurityContext), asFlag("kubernetes.podspec-shareprocessnamespace", &nc.PodSpecShareProcessNamespace), + asFlag("kubernetes.podspec-hostipc", &nc.PodSpecHostIPC), asFlag("kubernetes.podspec-priorityclassname", &nc.PodSpecPriorityClassName), asFlag("kubernetes.podspec-schedulername", &nc.PodSpecSchedulerName), asFlag("kubernetes.containerspec-addcapabilities", &nc.ContainerSpecAddCapabilities), asFlag("kubernetes.podspec-tolerations", &nc.PodSpecTolerations), asFlag("kubernetes.podspec-volumes-emptydir", &nc.PodSpecVolumesEmptyDir), + asFlag("kubernetes.podspec-hostipc", &nc.PodSpecHostIPC), + asFlag("kubernetes.podspec-hostpid", &nc.PodSpecHostPID), + asFlag("kubernetes.podspec-hostnetwork", &nc.PodSpecHostNetwork), asFlag("kubernetes.podspec-init-containers", &nc.PodSpecInitContainers), asFlag("kubernetes.podspec-persistent-volume-claim", &nc.PodSpecPersistentVolumeClaim), asFlag("kubernetes.podspec-persistent-volume-write", &nc.PodSpecPersistentVolumeWrite), @@ -136,6 +143,9 @@ type Features struct { PodSpecRuntimeClassName Flag PodSpecSecurityContext Flag PodSpecShareProcessNamespace Flag + PodSpecHostIPC Flag + PodSpecHostPID Flag + PodSpecHostNetwork Flag PodSpecPriorityClassName Flag PodSpecSchedulerName Flag ContainerSpecAddCapabilities Flag diff --git a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go index b9b3876bb..faff5dba9 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go @@ -263,16 +263,21 @@ func PodSpecMask(ctx context.Context, in *corev1.PodSpec) *corev1.PodSpec { if cfg.Features.PodSpecDNSConfig != config.Disabled { out.DNSConfig = in.DNSConfig } - + if cfg.Features.PodSpecHostIPC != config.Disabled { + out.HostIPC = in.HostIPC + } + if cfg.Features.PodSpecHostPID != config.Disabled { + out.HostPID = in.HostPID + } + if cfg.Features.PodSpecHostNetwork != config.Disabled { + out.HostNetwork = in.HostNetwork + } // Disallowed fields // This list is unnecessary, but added here for clarity out.RestartPolicy = "" out.TerminationGracePeriodSeconds = nil out.ActiveDeadlineSeconds = nil out.NodeName = "" - out.HostNetwork = false - out.HostPID = false - out.HostIPC = false out.Hostname = "" out.Subdomain = "" out.Priority = nil diff --git a/vendor/modules.txt b/vendor/modules.txt index a063e6b28..0719b621b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -967,7 +967,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.42.1-0.20240730184929-a9abf3ce4624 +# knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f ## explicit; go 1.22 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -1055,7 +1055,7 @@ knative.dev/eventing/pkg/observability knative.dev/eventing/pkg/observability/client knative.dev/eventing/pkg/reconciler/resources knative.dev/eventing/pkg/reconciler/source -# knative.dev/hack v0.0.0-20240730131549-0a23232167bc +# knative.dev/hack v0.0.0-20240801232131-441a19fc9ead ## explicit; go 1.21 knative.dev/hack # knative.dev/networking v0.0.0-20240730152525-543181c32243 @@ -1117,7 +1117,7 @@ knative.dev/pkg/tracker knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources -# knative.dev/serving v0.42.1-0.20240731122010-5225d4f557f4 +# knative.dev/serving v0.42.1-0.20240801154043-2b86c14394f7 ## explicit; go 1.22 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1