diff --git a/go.mod b/go.mod index e3652f9664a5..3689388e2c11 100644 --- a/go.mod +++ b/go.mod @@ -20,18 +20,18 @@ require ( go.opencensus.io v0.24.0 go.uber.org/atomic v1.10.0 go.uber.org/automaxprocs v1.6.0 - go.uber.org/zap v1.27.0 + go.uber.org/zap v1.27.1 golang.org/x/net v0.30.0 golang.org/x/sync v0.10.0 golang.org/x/sys v0.28.0 golang.org/x/time v0.6.0 google.golang.org/api v0.183.0 google.golang.org/grpc v1.67.1 - k8s.io/api v0.30.3 - k8s.io/apiextensions-apiserver v0.30.3 - k8s.io/apimachinery v0.30.3 - k8s.io/client-go v0.30.3 - k8s.io/code-generator v0.30.3 + k8s.io/api v0.30.14 + k8s.io/apiextensions-apiserver v0.30.14 + k8s.io/apimachinery v0.30.14 + k8s.io/client-go v0.30.14 + k8s.io/code-generator v0.30.14 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 diff --git a/go.sum b/go.sum index 61dd6b8b80c4..548ce6018aa0 100644 --- a/go.sum +++ b/go.sum @@ -547,8 +547,8 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= +go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -922,16 +922,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= -k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= -k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= -k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= -k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= -k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= -k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= -k8s.io/code-generator v0.30.3 h1:bmtnLJKagDS5f5uOEpLyJiDfIMKXGMKgOLBdde+w0Mc= -k8s.io/code-generator v0.30.3/go.mod h1:PFgBiv+miFV7TZYp+RXgROkhA+sWYZ+mtpbMLofMke8= +k8s.io/api v0.30.14 h1:iPq9YNOz1vHcSuN9YTmRUt8iPpB1cYPxxjgbY25xfS4= +k8s.io/api v0.30.14/go.mod h1:IdrH4AiKc2bqDDb1FAfwcP1pPRmDdyRIqNk4K8KkEoc= +k8s.io/apiextensions-apiserver v0.30.14 h1:7hi4CMq9EVT4vjdFpDZ/E1yOqhfU5IDHl2M8bexjA4s= +k8s.io/apiextensions-apiserver v0.30.14/go.mod h1:NHLlcx7YmhxktP+eBfjxYPmsfnmsBU2Ue3/ytHzAHJE= +k8s.io/apimachinery v0.30.14 h1:2OvEYwWoWeb25+xzFGP/8gChu+MfRNv24BlCQdnfGzQ= +k8s.io/apimachinery v0.30.14/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.14 h1:D81QZvBtv897JU4HRsx4YoaCDnzeZSvB8eApgmbtXVA= +k8s.io/client-go v0.30.14/go.mod h1:9ytP3kKzrz3ZWavlWih4NB0mTdYA0DB1ElBHimq+JqQ= +k8s.io/code-generator v0.30.14 h1:/y9zHj7j/JWSYWGu6cnOfyTs91ikH/HmGT+9HNqnHDg= +k8s.io/code-generator v0.30.14/go.mod h1:Wc44RY8LMr7oaSxEc/bjWBaxO1HRppIHA4t+Dw7CT6k= k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 h1:wBIDZID8ju9pwOiLlV22YYKjFGtiNSWgHf5CnKLRUuM= k8s.io/gengo v0.0.0-20240404160639-a0386bf69313/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/openshift/ci-operator/knative-images/activator/Dockerfile b/openshift/ci-operator/knative-images/activator/Dockerfile index a3c3bf476651..ab6ae4625e7f 100755 --- a/openshift/ci-operator/knative-images/activator/Dockerfile +++ b/openshift/ci-operator/knative-images/activator/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-activator-rhel8-container" \ - name="openshift-serverless-1/serving-activator-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-activator-rhel8-container" \ + name="openshift-serverless-1/kn-serving-activator-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Activator" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Activator" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Activator" \ io.k8s.description="Red Hat OpenShift Serverless Serving Activator" \ - io.openshift.tags="activator" - + io.openshift.tags="activator" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/activator"] diff --git a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile index 78495ed82373..c23101f2560f 100755 --- a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-autoscaler-hpa-rhel8-container" \ - name="openshift-serverless-1/serving-autoscaler-hpa-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-autoscaler-hpa-rhel8-container" \ + name="openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ io.k8s.description="Red Hat OpenShift Serverless Serving Autoscaler Hpa" \ - io.openshift.tags="autoscaler-hpa" - + io.openshift.tags="autoscaler-hpa" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/autoscaler-hpa"] diff --git a/openshift/ci-operator/knative-images/autoscaler/Dockerfile b/openshift/ci-operator/knative-images/autoscaler/Dockerfile index a9d714da443d..d8acfda7b7c8 100755 --- a/openshift/ci-operator/knative-images/autoscaler/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-autoscaler-rhel8-container" \ - name="openshift-serverless-1/serving-autoscaler-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-autoscaler-rhel8-container" \ + name="openshift-serverless-1/kn-serving-autoscaler-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ io.k8s.description="Red Hat OpenShift Serverless Serving Autoscaler" \ - io.openshift.tags="autoscaler" - + io.openshift.tags="autoscaler" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/autoscaler"] diff --git a/openshift/ci-operator/knative-images/cleanup/Dockerfile b/openshift/ci-operator/knative-images/cleanup/Dockerfile index 42824c40985a..1ea566a0d465 100755 --- a/openshift/ci-operator/knative-images/cleanup/Dockerfile +++ b/openshift/ci-operator/knative-images/cleanup/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Cleanup" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Cleanup" \ io.k8s.description="Red Hat OpenShift Serverless Serving Cleanup" \ - io.openshift.tags="cleanup" - + io.openshift.tags="cleanup" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/cleanup"] diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index ea3d11fa676c..c9bc8a38f4e7 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-controller-rhel8-container" \ - name="openshift-serverless-1/serving-controller-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-controller-rhel8-container" \ + name="openshift-serverless-1/kn-serving-controller-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Controller" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Controller" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Controller" \ io.k8s.description="Red Hat OpenShift Serverless Serving Controller" \ - io.openshift.tags="controller" - + io.openshift.tags="controller" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/controller"] diff --git a/openshift/ci-operator/knative-images/default-domain/Dockerfile b/openshift/ci-operator/knative-images/default-domain/Dockerfile index fbfc51baaeb9..e6b0df3ab867 100755 --- a/openshift/ci-operator/knative-images/default-domain/Dockerfile +++ b/openshift/ci-operator/knative-images/default-domain/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Default Domain" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Default Domain" \ io.k8s.description="Red Hat OpenShift Serverless Serving Default Domain" \ - io.openshift.tags="default-domain" - + io.openshift.tags="default-domain" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/default-domain"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index c1c8bbd0c11a..580bdc8cfafa 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-migrate-rhel8-container" \ - name="openshift-serverless-1/serving-migrate-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-storage-version-migration-rhel8-container" \ + name="openshift-serverless-1/kn-serving-storage-version-migration-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Migrate" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Migrate" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Migrate" \ io.k8s.description="Red Hat OpenShift Serverless Serving Migrate" \ - io.openshift.tags="migrate" - + io.openshift.tags="migrate" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/migrate"] diff --git a/openshift/ci-operator/knative-images/queue/Dockerfile b/openshift/ci-operator/knative-images/queue/Dockerfile index b67b0f36fff0..78657fd61d73 100755 --- a/openshift/ci-operator/knative-images/queue/Dockerfile +++ b/openshift/ci-operator/knative-images/queue/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-queue-rhel8-container" \ - name="openshift-serverless-1/serving-queue-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-queue-rhel8-container" \ + name="openshift-serverless-1/kn-serving-queue-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Queue" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Queue" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Queue" \ io.k8s.description="Red Hat OpenShift Serverless Serving Queue" \ - io.openshift.tags="queue" - + io.openshift.tags="queue" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/queue"] diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 245d541c73ae..ba7edae9f0ed 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-webhook-rhel8-container" \ - name="openshift-serverless-1/serving-webhook-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-webhook-rhel8-container" \ + name="openshift-serverless-1/kn-serving-webhook-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Webhook" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Webhook" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Webhook" \ io.k8s.description="Red Hat OpenShift Serverless Serving Webhook" \ - io.openshift.tags="webhook" - + io.openshift.tags="webhook" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/webhook"] diff --git a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile index 27767592702e..4ef331f5b17b 100755 --- a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile +++ b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Autoscale" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Autoscale" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Autoscale" \ - io.openshift.tags="test-test-images-autoscale" - + io.openshift.tags="test-test-images-autoscale" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/autoscale"] diff --git a/openshift/ci-operator/knative-test-images/failing/Dockerfile b/openshift/ci-operator/knative-test-images/failing/Dockerfile index 894136cbcb11..37232354bee5 100755 --- a/openshift/ci-operator/knative-test-images/failing/Dockerfile +++ b/openshift/ci-operator/knative-test-images/failing/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Failing" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Failing" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Failing" \ - io.openshift.tags="test-test-images-failing" - + io.openshift.tags="test-test-images-failing" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/failing"] diff --git a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile index de4302d22157..2c42a730526b 100755 --- a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile +++ b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Grpc Ping" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Grpc Ping" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Grpc Ping" \ - io.openshift.tags="test-test-images-grpc-ping" - + io.openshift.tags="test-test-images-grpc-ping" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/grpc-ping"] diff --git a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile index 339440b8deba..aca2a5267322 100755 --- a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellohttp2" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellohttp2" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Hellohttp2" \ - io.openshift.tags="test-test-images-hellohttp2" - + io.openshift.tags="test-test-images-hellohttp2" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/hellohttp2"] diff --git a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile index cf6042dc7f4c..0fde695658df 100755 --- a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellovolume" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellovolume" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Hellovolume" \ - io.openshift.tags="test-test-images-hellovolume" - + io.openshift.tags="test-test-images-hellovolume" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/hellovolume"] diff --git a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile index c860668329d9..709de5a50205 100755 --- a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile +++ b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Helloworld" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Helloworld" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Helloworld" \ - io.openshift.tags="test-test-images-helloworld" - + io.openshift.tags="test-test-images-helloworld" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/helloworld"] diff --git a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile index b7ee927e0c7d..abafa45b7af9 100755 --- a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile +++ b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Httpproxy" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Httpproxy" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Httpproxy" \ - io.openshift.tags="test-test-images-httpproxy" - + io.openshift.tags="test-test-images-httpproxy" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/httpproxy"] diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile index f98af9b053ae..99e56342463c 100755 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv1" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv1" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Pizzaplanetv1" \ - io.openshift.tags="test-test-images-pizzaplanetv1" - + io.openshift.tags="test-test-images-pizzaplanetv1" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/pizzaplanetv1"] diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile index 50b8515c1ba9..ff199af60f04 100755 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv2" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv2" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Pizzaplanetv2" \ - io.openshift.tags="test-test-images-pizzaplanetv2" - + io.openshift.tags="test-test-images-pizzaplanetv2" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/pizzaplanetv2"] diff --git a/openshift/ci-operator/knative-test-images/readiness/Dockerfile b/openshift/ci-operator/knative-test-images/readiness/Dockerfile index 1cab0f96991b..35dba17b2bd0 100755 --- a/openshift/ci-operator/knative-test-images/readiness/Dockerfile +++ b/openshift/ci-operator/knative-test-images/readiness/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Readiness" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Readiness" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Readiness" \ - io.openshift.tags="test-test-images-readiness" - + io.openshift.tags="test-test-images-readiness" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/readiness"] diff --git a/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile b/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile index 18636e583cf0..b525222e012e 100755 --- a/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile +++ b/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Revisionfailure" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Revisionfailure" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Revisionfailure" \ - io.openshift.tags="test-test-images-revisionfailure" - + io.openshift.tags="test-test-images-revisionfailure" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/revisionfailure"] diff --git a/openshift/ci-operator/knative-test-images/runtime/Dockerfile b/openshift/ci-operator/knative-test-images/runtime/Dockerfile index 6542e62db3af..aa59569da4d4 100755 --- a/openshift/ci-operator/knative-test-images/runtime/Dockerfile +++ b/openshift/ci-operator/knative-test-images/runtime/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Runtime" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Runtime" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Runtime" \ - io.openshift.tags="test-test-images-runtime" - + io.openshift.tags="test-test-images-runtime" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/runtime"] diff --git a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile index 2b9634d8d036..c0bc17fa2f25 100755 --- a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Multicontainer Servingcontainer" \ - io.openshift.tags="test-test-images-multicontainer-servingcontainer" - + io.openshift.tags="test-test-images-multicontainer-servingcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/servingcontainer"] diff --git a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile index eb38cbe66d03..8a23c1d19242 100755 --- a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Multicontainer Sidecarcontainer" \ - io.openshift.tags="test-test-images-multicontainer-sidecarcontainer" - + io.openshift.tags="test-test-images-multicontainer-sidecarcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/sidecarcontainer"] diff --git a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile index 7da311e6c43d..adcff77b3d54 100755 --- a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile +++ b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Singlethreaded" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Singlethreaded" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Singlethreaded" \ - io.openshift.tags="test-test-images-singlethreaded" - + io.openshift.tags="test-test-images-singlethreaded" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/singlethreaded"] diff --git a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile index 3e9da9b0a2f0..f180922b92cd 100755 --- a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile +++ b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Slowstart" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Slowstart" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Slowstart" \ - io.openshift.tags="test-test-images-slowstart" - + io.openshift.tags="test-test-images-slowstart" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/slowstart"] diff --git a/openshift/ci-operator/knative-test-images/timeout/Dockerfile b/openshift/ci-operator/knative-test-images/timeout/Dockerfile index 966e671bf50b..a50464269a74 100755 --- a/openshift/ci-operator/knative-test-images/timeout/Dockerfile +++ b/openshift/ci-operator/knative-test-images/timeout/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Timeout" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Timeout" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Timeout" \ - io.openshift.tags="test-test-images-timeout" - + io.openshift.tags="test-test-images-timeout" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/timeout"] diff --git a/openshift/ci-operator/knative-test-images/volumes/Dockerfile b/openshift/ci-operator/knative-test-images/volumes/Dockerfile index 2d65fd3984fc..503610a897ba 100755 --- a/openshift/ci-operator/knative-test-images/volumes/Dockerfile +++ b/openshift/ci-operator/knative-test-images/volumes/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Volumes" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Volumes" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Volumes" \ - io.openshift.tags="test-test-images-volumes" - + io.openshift.tags="test-test-images-volumes" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/volumes"] diff --git a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile index 0d95417410aa..a871e7c367e4 100755 --- a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Wsserver" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Wsserver" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Wsserver" \ - io.openshift.tags="test-test-images-wsserver" - + io.openshift.tags="test-test-images-wsserver" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/wsserver"] diff --git a/vendor/go.uber.org/zap/.golangci.yml b/vendor/go.uber.org/zap/.golangci.yml index 2346df135177..74faaa71d8cc 100644 --- a/vendor/go.uber.org/zap/.golangci.yml +++ b/vendor/go.uber.org/zap/.golangci.yml @@ -25,7 +25,7 @@ linters-settings: govet: # These govet checks are disabled by default, but they're useful. enable: - - niliness + - nilness - reflectvaluecompare - sortslice - unusedwrite diff --git a/vendor/go.uber.org/zap/CHANGELOG.md b/vendor/go.uber.org/zap/CHANGELOG.md index 6d6cd5f4d707..86e7e6f9820e 100644 --- a/vendor/go.uber.org/zap/CHANGELOG.md +++ b/vendor/go.uber.org/zap/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.1 (19 Nov 2025) +Enhancements: +* [#1501][]: prevent `Object` from panicking on nils +* [#1511][]: Fix a race condition in `WithLazy`. + +Thanks to @rabbbit, @alshopov, @jquirke, @arukiidou for their contributions to this release. + +[#1501]: https://github.com/uber-go/zap/pull/1501 +[#1511]: https://github.com/uber-go/zap/pull/1511 + ## 1.27.0 (20 Feb 2024) Enhancements: * [#1378][]: Add `WithLazy` method for `SugaredLogger`. diff --git a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md b/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md index e327d9aa5cd0..bc988b72ed0c 100644 --- a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md +++ b/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md @@ -71,5 +71,5 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]. -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/4/ diff --git a/vendor/go.uber.org/zap/LICENSE b/vendor/go.uber.org/zap/LICENSE index 6652bed45f40..3883b9a7eab6 100644 --- a/vendor/go.uber.org/zap/LICENSE +++ b/vendor/go.uber.org/zap/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2017 Uber Technologies, Inc. +Copyright (c) 2016-2024 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/go.uber.org/zap/Makefile b/vendor/go.uber.org/zap/Makefile index eb1cee53bd51..f9db385b34c8 100644 --- a/vendor/go.uber.org/zap/Makefile +++ b/vendor/go.uber.org/zap/Makefile @@ -24,7 +24,7 @@ golangci-lint: @$(foreach mod,$(MODULE_DIRS), \ (cd $(mod) && \ echo "[lint] golangci-lint: $(mod)" && \ - golangci-lint run --path-prefix $(mod)) &&) true + golangci-lint run --path-prefix $(mod) ./...) &&) true .PHONY: tidy tidy: diff --git a/vendor/go.uber.org/zap/field.go b/vendor/go.uber.org/zap/field.go index 6743930b8236..1884afabcd3b 100644 --- a/vendor/go.uber.org/zap/field.go +++ b/vendor/go.uber.org/zap/field.go @@ -398,6 +398,9 @@ func Durationp(key string, val *time.Duration) Field { // struct-like user-defined types to the logging context. The struct's // MarshalLogObject method is called lazily. func Object(key string, val zapcore.ObjectMarshaler) Field { + if val == nil { + return nilField(key) + } return Field{Key: key, Type: zapcore.ObjectMarshalerType, Interface: val} } @@ -431,6 +434,13 @@ func (d dictObject) MarshalLogObject(enc zapcore.ObjectEncoder) error { return nil } +// DictObject constructs a [zapcore.ObjectMarshaler] with the given list of fields. +// The resulting object marshaler can be used as input to [Object], [Objects], or +// any other functions that expect an object marshaler. +func DictObject(val ...Field) zapcore.ObjectMarshaler { + return dictObject(val) +} + // We discovered an issue where zap.Any can cause a performance degradation // when used in new goroutines. // diff --git a/vendor/go.uber.org/zap/http_handler.go b/vendor/go.uber.org/zap/http_handler.go index 2be8f6515005..1cae2c164b57 100644 --- a/vendor/go.uber.org/zap/http_handler.go +++ b/vendor/go.uber.org/zap/http_handler.go @@ -71,7 +71,7 @@ import ( func (lvl AtomicLevel) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := lvl.serveHTTP(w, r); err != nil { w.WriteHeader(http.StatusInternalServerError) - fmt.Fprintf(w, "internal error: %v", err) + _, _ = fmt.Fprintf(w, "internal error: %v", err) } } diff --git a/vendor/go.uber.org/zap/logger.go b/vendor/go.uber.org/zap/logger.go index c4d30032394d..2d0ef141bcf2 100644 --- a/vendor/go.uber.org/zap/logger.go +++ b/vendor/go.uber.org/zap/logger.go @@ -381,7 +381,11 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry { if stack.Count() == 0 { if log.addCaller { - fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC()) + _, _ = fmt.Fprintf( + log.errorOutput, + "%v Logger.check error: failed to get caller\n", + ent.Time.UTC(), + ) _ = log.errorOutput.Sync() } return ce diff --git a/vendor/go.uber.org/zap/options.go b/vendor/go.uber.org/zap/options.go index 43d357ac9026..04a3c1e6357a 100644 --- a/vendor/go.uber.org/zap/options.go +++ b/vendor/go.uber.org/zap/options.go @@ -125,7 +125,11 @@ func IncreaseLevel(lvl zapcore.LevelEnabler) Option { return optionFunc(func(log *Logger) { core, err := zapcore.NewIncreaseLevelCore(log.core, lvl) if err != nil { - fmt.Fprintf(log.errorOutput, "failed to IncreaseLevel: %v\n", err) + _, _ = fmt.Fprintf( + log.errorOutput, + "failed to IncreaseLevel: %v\n", + err, + ) } else { log.core = core } diff --git a/vendor/go.uber.org/zap/sink.go b/vendor/go.uber.org/zap/sink.go index 499772a00dc9..92202280f137 100644 --- a/vendor/go.uber.org/zap/sink.go +++ b/vendor/go.uber.org/zap/sink.go @@ -71,7 +71,7 @@ func newSinkRegistry() *sinkRegistry { return sr } -// RegisterScheme registers the given factory for the specific scheme. +// RegisterSink registers the given factory for the specific scheme. func (sr *sinkRegistry) RegisterSink(scheme string, factory func(*url.URL) (Sink, error)) error { sr.mu.Lock() defer sr.mu.Unlock() diff --git a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go b/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go index a40e93b3ec8f..4b426a564874 100644 --- a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go +++ b/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go @@ -188,32 +188,33 @@ func (s *BufferedWriteSyncer) flushLoop() { // Stop closes the buffer, cleans up background goroutines, and flushes // remaining unwritten data. func (s *BufferedWriteSyncer) Stop() (err error) { - var stopped bool - // Critical section. - func() { + stopped := func() bool { s.mu.Lock() defer s.mu.Unlock() if !s.initialized { - return + return false } - stopped = s.stopped - if stopped { - return + if s.stopped { + return false } s.stopped = true s.ticker.Stop() close(s.stop) // tell flushLoop to stop - <-s.done // and wait until it has + return true }() - // Don't call Sync on consecutive Stops. + // Not initialized, or already stopped, no need for any cleanup. if !stopped { - err = s.Sync() + return } - return err + // Wait for flushLoop to end outside of the lock, as it may need the lock to complete. + // See https://github.com/uber-go/zap/issues/1428 for details. + <-s.done + + return s.Sync() } diff --git a/vendor/go.uber.org/zap/zapcore/console_encoder.go b/vendor/go.uber.org/zap/zapcore/console_encoder.go index cc2b4e07b932..98eea5154d47 100644 --- a/vendor/go.uber.org/zap/zapcore/console_encoder.go +++ b/vendor/go.uber.org/zap/zapcore/console_encoder.go @@ -105,7 +105,7 @@ func (c consoleEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer, if i > 0 { line.AppendString(c.ConsoleSeparator) } - fmt.Fprint(line, arr.elems[i]) + _, _ = fmt.Fprint(line, arr.elems[i]) } putSliceEncoder(arr) diff --git a/vendor/go.uber.org/zap/zapcore/entry.go b/vendor/go.uber.org/zap/zapcore/entry.go index 459a5d7ce3ca..841752f2ed6c 100644 --- a/vendor/go.uber.org/zap/zapcore/entry.go +++ b/vendor/go.uber.org/zap/zapcore/entry.go @@ -241,7 +241,12 @@ func (ce *CheckedEntry) Write(fields ...Field) { // If the entry is dirty, log an internal error; because the // CheckedEntry is being used after it was returned to the pool, // the message may be an amalgamation from multiple call sites. - fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", ce.Time, ce.Entry) + _, _ = fmt.Fprintf( + ce.ErrorOutput, + "%v Unsafe CheckedEntry re-use near Entry %+v.\n", + ce.Time, + ce.Entry, + ) _ = ce.ErrorOutput.Sync() // ignore error } return @@ -253,7 +258,12 @@ func (ce *CheckedEntry) Write(fields ...Field) { err = multierr.Append(err, ce.cores[i].Write(ce.Entry, fields)) } if err != nil && ce.ErrorOutput != nil { - fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", ce.Time, err) + _, _ = fmt.Fprintf( + ce.ErrorOutput, + "%v write error: %v\n", + ce.Time, + err, + ) _ = ce.ErrorOutput.Sync() // ignore error } diff --git a/vendor/go.uber.org/zap/zapcore/lazy_with.go b/vendor/go.uber.org/zap/zapcore/lazy_with.go index 05288d6a88e1..500809de08b9 100644 --- a/vendor/go.uber.org/zap/zapcore/lazy_with.go +++ b/vendor/go.uber.org/zap/zapcore/lazy_with.go @@ -23,7 +23,8 @@ package zapcore import "sync" type lazyWithCore struct { - Core + core Core + originalCore Core sync.Once fields []Field } @@ -32,23 +33,45 @@ type lazyWithCore struct { // the logger is written to (or is further chained in a lon-lazy manner). func NewLazyWith(core Core, fields []Field) Core { return &lazyWithCore{ - Core: core, - fields: fields, + core: nil, // core is allocated once `initOnce` is called. + originalCore: core, + fields: fields, } } func (d *lazyWithCore) initOnce() { d.Once.Do(func() { - d.Core = d.Core.With(d.fields) + d.core = d.originalCore.With(d.fields) }) } func (d *lazyWithCore) With(fields []Field) Core { d.initOnce() - return d.Core.With(fields) + return d.core.With(fields) } func (d *lazyWithCore) Check(e Entry, ce *CheckedEntry) *CheckedEntry { + // This is safe because `lazyWithCore` doesn't change the level. + // So we can delagate the level check, any not `initOnce` + // just for the check. + if !d.originalCore.Enabled(e.Level) { + return ce + } + d.initOnce() + return d.core.Check(e, ce) +} + +func (d *lazyWithCore) Enabled(level Level) bool { + // Like above, this is safe because `lazyWithCore` doesn't change the level. + return d.originalCore.Enabled(level) +} + +func (d *lazyWithCore) Write(e Entry, fields []Field) error { + d.initOnce() + return d.core.Write(e, fields) +} + +func (d *lazyWithCore) Sync() error { d.initOnce() - return d.Core.Check(e, ce) + return d.core.Sync() } diff --git a/vendor/go.uber.org/zap/zapcore/level.go b/vendor/go.uber.org/zap/zapcore/level.go index e01a2413166d..f3e166d67b0f 100644 --- a/vendor/go.uber.org/zap/zapcore/level.go +++ b/vendor/go.uber.org/zap/zapcore/level.go @@ -179,19 +179,19 @@ func (l *Level) UnmarshalText(text []byte) error { func (l *Level) unmarshalText(text []byte) bool { switch string(text) { - case "debug", "DEBUG": + case "debug": *l = DebugLevel - case "info", "INFO", "": // make the zero value useful + case "info", "": // make the zero value useful *l = InfoLevel - case "warn", "WARN": + case "warn", "warning": *l = WarnLevel - case "error", "ERROR": + case "error": *l = ErrorLevel - case "dpanic", "DPANIC": + case "dpanic": *l = DPanicLevel - case "panic", "PANIC": + case "panic": *l = PanicLevel - case "fatal", "FATAL": + case "fatal": *l = FatalLevel default: return false diff --git a/vendor/k8s.io/api/admissionregistration/v1/types.go b/vendor/k8s.io/api/admissionregistration/v1/types.go index 0510712b2469..b9ce1f0335c7 100644 --- a/vendor/k8s.io/api/admissionregistration/v1/types.go +++ b/vendor/k8s.io/api/admissionregistration/v1/types.go @@ -203,7 +203,7 @@ type ValidatingAdmissionPolicyList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ValidatingAdmissionPolicy. - Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy. @@ -464,7 +464,7 @@ type ValidatingAdmissionPolicyBindingList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of PolicyBinding. - Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding. diff --git a/vendor/k8s.io/api/admissionregistration/v1alpha1/types.go b/vendor/k8s.io/api/admissionregistration/v1alpha1/types.go index bd6b17e15880..78d918bc72f4 100644 --- a/vendor/k8s.io/api/admissionregistration/v1alpha1/types.go +++ b/vendor/k8s.io/api/admissionregistration/v1alpha1/types.go @@ -142,7 +142,7 @@ type ValidatingAdmissionPolicyList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ValidatingAdmissionPolicy. - Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy. @@ -404,7 +404,7 @@ type ValidatingAdmissionPolicyBindingList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of PolicyBinding. - Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding. diff --git a/vendor/k8s.io/api/admissionregistration/v1beta1/types.go b/vendor/k8s.io/api/admissionregistration/v1beta1/types.go index cf1e29a6cab8..0f5903123923 100644 --- a/vendor/k8s.io/api/admissionregistration/v1beta1/types.go +++ b/vendor/k8s.io/api/admissionregistration/v1beta1/types.go @@ -158,7 +158,7 @@ type ValidatingAdmissionPolicyList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ValidatingAdmissionPolicy. - Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy. @@ -419,7 +419,7 @@ type ValidatingAdmissionPolicyBindingList struct { // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of PolicyBinding. - Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` + Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"` } // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding. diff --git a/vendor/k8s.io/api/batch/v1/types.go b/vendor/k8s.io/api/batch/v1/types.go index 49b0ec6441d5..adaefbab5a8e 100644 --- a/vendor/k8s.io/api/batch/v1/types.go +++ b/vendor/k8s.io/api/batch/v1/types.go @@ -174,7 +174,7 @@ type PodFailurePolicyOnExitCodesRequirement struct { // When specified, it should match one the container or initContainer // names in the pod template. // +optional - ContainerName *string `json:"containerName" protobuf:"bytes,1,opt,name=containerName"` + ContainerName *string `json:"containerName,omitempty" protobuf:"bytes,1,opt,name=containerName"` // Represents the relationship between the container exit code(s) and the // specified values. Containers completed with success (exit code 0) are @@ -234,14 +234,14 @@ type PodFailurePolicyRule struct { // Represents the requirement on the container exit codes. // +optional - OnExitCodes *PodFailurePolicyOnExitCodesRequirement `json:"onExitCodes" protobuf:"bytes,2,opt,name=onExitCodes"` + OnExitCodes *PodFailurePolicyOnExitCodesRequirement `json:"onExitCodes,omitempty" protobuf:"bytes,2,opt,name=onExitCodes"` // Represents the requirement on the pod conditions. The requirement is represented // as a list of pod condition patterns. The requirement is satisfied if at // least one pattern matches an actual pod condition. At most 20 elements are allowed. // +listType=atomic // +optional - OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions" protobuf:"bytes,3,opt,name=onPodConditions"` + OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions,omitempty" protobuf:"bytes,3,opt,name=onPodConditions"` } // PodFailurePolicy describes how failed pods influence the backoffLimit. diff --git a/vendor/k8s.io/api/core/v1/generated.proto b/vendor/k8s.io/api/core/v1/generated.proto index f3b47c722d17..9ebc9b91bc53 100644 --- a/vendor/k8s.io/api/core/v1/generated.proto +++ b/vendor/k8s.io/api/core/v1/generated.proto @@ -1997,6 +1997,7 @@ message HostAlias { // HostIP represents a single IP address allocated to the host. message HostIP { // IP is the IP address assigned to the host + // +required optional string ip = 1; } @@ -3693,6 +3694,7 @@ message PodExecOptions { // PodIP represents a single IP address allocated to the pod. message PodIP { // IP is the IP address assigned to the pod + // +required optional string ip = 1; } diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go index 328df9a7b7dd..d5eca377592d 100644 --- a/vendor/k8s.io/api/core/v1/types.go +++ b/vendor/k8s.io/api/core/v1/types.go @@ -4340,13 +4340,15 @@ type PodDNSConfigOption struct { // PodIP represents a single IP address allocated to the pod. type PodIP struct { // IP is the IP address assigned to the pod - IP string `json:"ip,omitempty" protobuf:"bytes,1,opt,name=ip"` + // +required + IP string `json:"ip" protobuf:"bytes,1,opt,name=ip"` } // HostIP represents a single IP address allocated to the host. type HostIP struct { // IP is the IP address assigned to the host - IP string `json:"ip,omitempty" protobuf:"bytes,1,opt,name=ip"` + // +required + IP string `json:"ip" protobuf:"bytes,1,opt,name=ip"` } // EphemeralContainerCommon is a copy of all fields in Container to be inlined in diff --git a/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go b/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go index 47bfb44e0c3e..5cc22c970006 100644 --- a/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -5661,6 +5661,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: ip type: scalar: string + default: "" - name: io.k8s.api.core.v1.HostPathVolumeSource map: fields: @@ -6747,6 +6748,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: ip type: scalar: string + default: "" - name: io.k8s.api.core.v1.PodOS map: fields: diff --git a/vendor/k8s.io/code-generator/tools.go b/vendor/k8s.io/code-generator/tools.go index d0e2c7764f2e..4080b2c5907b 100644 --- a/vendor/k8s.io/code-generator/tools.go +++ b/vendor/k8s.io/code-generator/tools.go @@ -31,4 +31,5 @@ import ( _ "k8s.io/code-generator/cmd/informer-gen" _ "k8s.io/code-generator/cmd/lister-gen" _ "k8s.io/code-generator/cmd/register-gen" + _ "k8s.io/kube-openapi/cmd/openapi-gen" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index c014ad5c1b8b..c3e068462c78 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -574,7 +574,7 @@ go.uber.org/automaxprocs/maxprocs # go.uber.org/multierr v1.11.0 ## explicit; go 1.19 go.uber.org/multierr -# go.uber.org/zap v1.27.0 +# go.uber.org/zap v1.27.1 ## explicit; go 1.19 go.uber.org/zap go.uber.org/zap/buffer @@ -809,7 +809,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.3 +# k8s.io/api v0.30.14 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admissionregistration/v1 @@ -866,7 +866,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.3 +# k8s.io/apiextensions-apiserver v0.30.14 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 @@ -877,7 +877,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -# k8s.io/apimachinery v0.30.3 +# k8s.io/apimachinery v0.30.14 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/apitesting/fuzzer @@ -931,7 +931,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.30.3 +# k8s.io/client-go v0.30.14 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1246,7 +1246,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.30.3 +# k8s.io/code-generator v0.30.14 ## explicit; go 1.22.0 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen