From 5d187a7d71d7c784661642da8a3a9ace5a6b9504 Mon Sep 17 00:00:00 2001 From: Vincent Hou Date: Tue, 22 Oct 2024 10:44:18 -0400 Subject: [PATCH] [release-1.15] Updated the manifests for release-1.15 --- .../1.14/kafka/eventing-kafka-controller.yaml | 70 ++++---- .../kafka/eventing-kafka-post-install.yaml | 24 +-- .../1.14/kafka/eventing-kafka-source.yaml | 14 +- .../1.15/kafka/eventing-kafka-controller.yaml | 70 ++++---- .../kafka/eventing-kafka-post-install.yaml | 22 +-- .../1.15/kafka/eventing-kafka-source.yaml | 14 +- go.mod | 6 +- go.sum | 12 +- vendor/knative.dev/hack/boilerplate.go.txt | 15 -- vendor/knative.dev/hack/codegen-library.sh | 159 ++-------------- vendor/knative.dev/hack/embed.go | 2 +- vendor/knative.dev/hack/go.work | 2 +- vendor/knative.dev/hack/go.work.sum | 143 ++++++--------- vendor/knative.dev/hack/library.sh | 169 ++++-------------- vendor/knative.dev/hack/presubmit-tests.sh | 8 +- vendor/knative.dev/hack/release.sh | 6 +- vendor/modules.txt | 8 +- 17 files changed, 222 insertions(+), 522 deletions(-) delete mode 100644 vendor/knative.dev/hack/boilerplate.go.txt diff --git a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-controller.yaml b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-controller.yaml index 30eee72a81..81cbda688e 100644 --- a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-controller.yaml +++ b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-controller.yaml @@ -17,7 +17,7 @@ metadata: name: kafka-broker-config namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: default.topic.partitions: "10" default.topic.replication.factor: "3" @@ -43,7 +43,7 @@ metadata: name: kafka-channel-config namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: bootstrap.servers: "my-cluster-kafka-bootstrap.kafka:9092" @@ -67,7 +67,7 @@ kind: CustomResourceDefinition metadata: name: kafkachannels.messaging.knative.dev labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -400,7 +400,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" knative.dev/crd-install: "true" name: consumers.internal.kafka.eventing.knative.dev spec: @@ -456,7 +456,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" knative.dev/crd-install: "true" name: consumergroups.internal.kafka.eventing.knative.dev spec: @@ -527,7 +527,7 @@ metadata: labels: duck.knative.dev/addressable: "true" knative.dev/crd-install: "true" - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" spec: group: eventing.knative.dev names: @@ -711,7 +711,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1167,7 +1167,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: eventing-kafka-source-observer labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" duck.knative.dev/source: "true" rules: - apiGroups: @@ -1200,7 +1200,7 @@ metadata: name: config-kafka-source-defaults namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" annotations: knative.dev/example-checksum: "b6ed351d" data: @@ -1260,7 +1260,7 @@ metadata: name: config-kafka-autoscaler namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: class: "keda.autoscaling.knative.dev" min-scale: "0" @@ -1290,7 +1290,7 @@ metadata: name: config-kafka-descheduler namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: predicates: | [] @@ -1363,7 +1363,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" name: config-kafka-leader-election namespace: knative-eventing annotations: @@ -1430,7 +1430,7 @@ metadata: name: config-kafka-scheduler namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: predicates: | [ @@ -1470,7 +1470,7 @@ metadata: name: kafka-config-logging namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" data: config.xml: | @@ -1532,7 +1532,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -1592,7 +1592,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-kafka-addressable-resolver labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -1635,7 +1635,7 @@ kind: ClusterRole metadata: name: knative-kafka-channelable-manipulator labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -1672,7 +1672,7 @@ kind: ClusterRole metadata: name: kafka-controller labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" rules: - apiGroups: - "" @@ -1960,7 +1960,7 @@ metadata: name: kafka-controller namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" --- # Copyright 2020 The Knative Authors @@ -1981,7 +1981,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: kafka-controller @@ -1996,7 +1996,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller-addressable-resolver labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: kafka-controller @@ -2027,7 +2027,7 @@ metadata: namespace: knative-eventing labels: app: kafka-controller - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-controller app.kubernetes.io/name: knative-eventing spec: @@ -2039,7 +2039,7 @@ spec: name: kafka-controller labels: app: kafka-controller - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-controller app.kubernetes.io/name: knative-eventing spec: @@ -2065,7 +2065,7 @@ spec: weight: 100 containers: - name: controller - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/kafka-controller@sha256:b16255242dd6eb16fff32cdc82c1861da5b3e27145aff7a6a6220c1e7a76197d + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/kafka-controller@sha256:98b60da4bb1091162dbf6f7845421ad2be33c81ebc04f9e6a926c92aef874456 imagePullPolicy: IfNotPresent env: - name: BROKER_DATA_PLANE_CONFIG_MAP_NAMESPACE @@ -2206,7 +2206,7 @@ kind: ClusterRole metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" rules: # For watching logging configuration and getting certs. - apiGroups: @@ -2308,7 +2308,7 @@ metadata: name: kafka-webhook-eventing namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" --- # Copyright 2020 The Knative Authors @@ -2329,7 +2329,7 @@ kind: ClusterRoleBinding metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: kafka-webhook-eventing @@ -2359,7 +2359,7 @@ kind: MutatingWebhookConfiguration metadata: name: defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2391,7 +2391,7 @@ kind: MutatingWebhookConfiguration metadata: name: pods.defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" webhooks: # Dispatcher pods webhook config. - admissionReviewVersions: ["v1", "v1beta1"] @@ -2433,7 +2433,7 @@ metadata: name: kafka-webhook-eventing-certs namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" # The data is populated at install time. --- @@ -2456,7 +2456,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2490,7 +2490,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2501,7 +2501,7 @@ spec: metadata: labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2521,7 +2521,7 @@ spec: containers: - name: kafka-webhook-eventing terminationMessagePolicy: FallbackToLogsOnError - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/webhook-kafka@sha256:a15c0b9dcc72caba7f0bfe9fca480787018345605d832c27617ffef737a97460 + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/webhook-kafka@sha256:20d7844cba70ae508ee8b3004a3795cf80b48f2eb679f4629dcbc919eaf6bc3d resources: requests: cpu: 20m @@ -2591,7 +2591,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: diff --git a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-post-install.yaml b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-post-install.yaml index 1e0f69f25a..a9af4568b3 100644 --- a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-post-install.yaml +++ b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-post-install.yaml @@ -16,7 +16,7 @@ kind: ClusterRole metadata: name: knative-kafka-controller-post-install labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" rules: # we need to be able to delete old deployments - apiGroups: @@ -56,7 +56,7 @@ metadata: name: knative-kafka-controller-post-install namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" --- # Copyright 2020 The Knative Authors @@ -78,7 +78,7 @@ kind: ClusterRole metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" rules: # Storage version upgrader needs to be able to patch CRDs. - apiGroups: @@ -161,14 +161,14 @@ metadata: name: knative-kafka-storage-version-migrator namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: knative-kafka-storage-version-migrator @@ -197,7 +197,7 @@ kind: ClusterRoleBinding metadata: name: knative-kafka-controller-post-install labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: knative-kafka-controller-post-install @@ -229,7 +229,7 @@ metadata: namespace: knative-eventing labels: app: kafka-controller-post-install - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -237,7 +237,7 @@ spec: metadata: labels: app: kafka-controller-post-install - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" annotations: sidecar.istio.io/inject: "false" spec: @@ -245,7 +245,7 @@ spec: restartPolicy: OnFailure containers: - name: post-install - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/post-install@sha256:30011e85be721ee9257c230a77f4350261a0a718d184e535394bc246cb1bbb0c + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/post-install@sha256:ca3d6a57da55f89289f3d7fbd0fe5f9b28362c36ce9f70a9fda90322e14e4621 env: - name: SYSTEM_NAMESPACE valueFrom: @@ -285,7 +285,7 @@ metadata: namespace: knative-eventing labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -293,7 +293,7 @@ spec: metadata: labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" annotations: sidecar.istio.io/inject: "false" spec: @@ -301,7 +301,7 @@ spec: restartPolicy: OnFailure containers: - name: migrate - image: gcr.io/knative-releases/knative.dev/pkg/apiextensions/storageversion/cmd/migrate@sha256:ef8fbd22fbbfebd2a8697dc5a6f0a085188d5ad67e1f83759855e3fd26742263 + image: gcr.io/knative-releases/knative.dev/pkg/apiextensions/storageversion/cmd/migrate@sha256:51711253c6cf3a3ed3019fb1e4b537937c8a008a22bd22d4aebe2dd498f72a12 env: - name: IGNORE_NOT_FOUND value: "true" diff --git a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-source.yaml b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-source.yaml index aefc5b18d3..efdacb3811 100644 --- a/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-source.yaml +++ b/cmd/operator/kodata/eventing-source/1.14/kafka/eventing-kafka-source.yaml @@ -17,7 +17,7 @@ metadata: name: config-kafka-source-data-plane namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" annotations: knative.dev/example-checksum: "8157ecb1" data: @@ -178,7 +178,7 @@ kind: ClusterRole metadata: name: knative-kafka-source-data-plane labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" rules: - apiGroups: - "" @@ -215,7 +215,7 @@ metadata: name: knative-kafka-source-data-plane namespace: knative-eventing labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" --- # Copyright 2021 The Knative Authors @@ -236,7 +236,7 @@ kind: ClusterRoleBinding metadata: name: knative-kafka-source-data-plane labels: - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" subjects: - kind: ServiceAccount name: knative-kafka-source-data-plane @@ -267,7 +267,7 @@ metadata: namespace: knative-eventing labels: app: kafka-source-dispatcher - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-source-dispatcher app.kubernetes.io/name: knative-eventing spec: @@ -281,7 +281,7 @@ spec: name: kafka-source-dispatcher labels: app: kafka-source-dispatcher - app.kubernetes.io/version: "f436cd965d35299f8dd6bf1338cbbfbd8522927e" + app.kubernetes.io/version: "70180a1e4050d46d275153a81a2a7e654a2ce192" app.kubernetes.io/component: kafka-channel-dispatcher app.kubernetes.io/name: knative-eventing app.kubernetes.io/kind: kafka-dispatcher @@ -308,7 +308,7 @@ spec: runAsUser: 1001 containers: - name: kafka-source-dispatcher - image: gcr.io/knative-releases/knative-kafka-broker-dispatcher-loom@sha256:20b10614f63840f8d0a44c17c68b0e996197dae5e3def5164ce943e8200b16df + image: gcr.io/knative-releases/knative-kafka-broker-dispatcher-loom@sha256:47c77a4265ade4a13bd0c8f4ba8a81199c46eb2282d1f70a1188adb1c4f4c01b imagePullPolicy: IfNotPresent volumeMounts: - mountPath: /etc/config diff --git a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-controller.yaml b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-controller.yaml index 11911d8a00..a79294de84 100644 --- a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-controller.yaml +++ b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-controller.yaml @@ -17,7 +17,7 @@ metadata: name: kafka-broker-config namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: default.topic.partitions: "10" default.topic.replication.factor: "3" @@ -43,7 +43,7 @@ metadata: name: kafka-channel-config namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: bootstrap.servers: "my-cluster-kafka-bootstrap.kafka:9092" @@ -67,7 +67,7 @@ kind: CustomResourceDefinition metadata: name: kafkachannels.messaging.knative.dev labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -400,7 +400,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" knative.dev/crd-install: "true" name: consumers.internal.kafka.eventing.knative.dev spec: @@ -456,7 +456,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" knative.dev/crd-install: "true" name: consumergroups.internal.kafka.eventing.knative.dev spec: @@ -527,7 +527,7 @@ metadata: labels: duck.knative.dev/addressable: "true" knative.dev/crd-install: "true" - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" spec: group: eventing.knative.dev names: @@ -711,7 +711,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1167,7 +1167,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: eventing-kafka-source-observer labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" duck.knative.dev/source: "true" rules: - apiGroups: @@ -1200,7 +1200,7 @@ metadata: name: config-kafka-source-defaults namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" annotations: knative.dev/example-checksum: "b6ed351d" data: @@ -1260,7 +1260,7 @@ metadata: name: config-kafka-autoscaler namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: class: "keda.autoscaling.knative.dev" min-scale: "0" @@ -1290,7 +1290,7 @@ metadata: name: config-kafka-descheduler namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: predicates: | [] @@ -1363,7 +1363,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" name: config-kafka-leader-election namespace: knative-eventing annotations: @@ -1430,7 +1430,7 @@ metadata: name: config-kafka-scheduler namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: predicates: | [ @@ -1470,7 +1470,7 @@ metadata: name: kafka-config-logging namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" data: config.xml: | @@ -1532,7 +1532,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -1592,7 +1592,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-kafka-addressable-resolver labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -1635,7 +1635,7 @@ kind: ClusterRole metadata: name: knative-kafka-channelable-manipulator labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -1672,7 +1672,7 @@ kind: ClusterRole metadata: name: kafka-controller labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" rules: - apiGroups: - "" @@ -1962,7 +1962,7 @@ metadata: name: kafka-controller namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" --- # Copyright 2020 The Knative Authors @@ -1983,7 +1983,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: kafka-controller @@ -1998,7 +1998,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller-addressable-resolver labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: kafka-controller @@ -2029,7 +2029,7 @@ metadata: namespace: knative-eventing labels: app: kafka-controller - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-controller app.kubernetes.io/name: knative-eventing spec: @@ -2041,7 +2041,7 @@ spec: name: kafka-controller labels: app: kafka-controller - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-controller app.kubernetes.io/name: knative-eventing spec: @@ -2067,7 +2067,7 @@ spec: weight: 100 containers: - name: controller - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/kafka-controller@sha256:1eefbce6def3a014c47c6641837560ea0ae4d2d4072c597b88ff19d23de2e8b7 + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/kafka-controller@sha256:988514554671f615b74b14e439d62ed39f0f7143dda8a1a3ffc8a3f43aaecc44 imagePullPolicy: IfNotPresent env: - name: BROKER_DATA_PLANE_CONFIG_MAP_NAMESPACE @@ -2208,7 +2208,7 @@ kind: ClusterRole metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" rules: # For watching logging configuration and getting certs. - apiGroups: @@ -2310,7 +2310,7 @@ metadata: name: kafka-webhook-eventing namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" --- # Copyright 2020 The Knative Authors @@ -2331,7 +2331,7 @@ kind: ClusterRoleBinding metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: kafka-webhook-eventing @@ -2361,7 +2361,7 @@ kind: MutatingWebhookConfiguration metadata: name: defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2393,7 +2393,7 @@ kind: MutatingWebhookConfiguration metadata: name: pods.defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" webhooks: # Dispatcher pods webhook config. - admissionReviewVersions: ["v1", "v1beta1"] @@ -2435,7 +2435,7 @@ metadata: name: kafka-webhook-eventing-certs namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" # The data is populated at install time. --- @@ -2458,7 +2458,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2492,7 +2492,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2503,7 +2503,7 @@ spec: metadata: labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2523,7 +2523,7 @@ spec: containers: - name: kafka-webhook-eventing terminationMessagePolicy: FallbackToLogsOnError - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/webhook-kafka@sha256:13eebb26e9e3cb2c7b461f80fc84f0746d0660786bacf7225ff4711a90f40dc4 + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/webhook-kafka@sha256:75c1bc39106b509ea0bed4e285d555e589e24521961645c1db61cfa2f2a258f5 resources: requests: cpu: 20m @@ -2593,7 +2593,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: diff --git a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-post-install.yaml b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-post-install.yaml index 41311b14ce..2ae35d9c1f 100644 --- a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-post-install.yaml +++ b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-post-install.yaml @@ -16,7 +16,7 @@ kind: ClusterRole metadata: name: knative-kafka-controller-post-install labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" rules: # we need to be able to delete old deployments - apiGroups: @@ -56,7 +56,7 @@ metadata: name: knative-kafka-controller-post-install namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" --- # Copyright 2020 The Knative Authors @@ -78,7 +78,7 @@ kind: ClusterRole metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" rules: # Storage version upgrader needs to be able to patch CRDs. - apiGroups: @@ -161,14 +161,14 @@ metadata: name: knative-kafka-storage-version-migrator namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: knative-kafka-storage-version-migrator @@ -197,7 +197,7 @@ kind: ClusterRoleBinding metadata: name: knative-kafka-controller-post-install labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: knative-kafka-controller-post-install @@ -229,7 +229,7 @@ metadata: namespace: knative-eventing labels: app: kafka-controller-post-install - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -237,7 +237,7 @@ spec: metadata: labels: app: kafka-controller-post-install - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" annotations: sidecar.istio.io/inject: "false" spec: @@ -245,7 +245,7 @@ spec: restartPolicy: OnFailure containers: - name: post-install - image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/post-install@sha256:c32b066dfe28980b310d0ee9249daa50cd041d88d3293e772c80f8acd1d7ff4c + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/post-install@sha256:e030096127881bec96401d6fd536f9a8e35357007fcf6229a13b0cfcc580f60d env: - name: SYSTEM_NAMESPACE valueFrom: @@ -285,7 +285,7 @@ metadata: namespace: knative-eventing labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -293,7 +293,7 @@ spec: metadata: labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" annotations: sidecar.istio.io/inject: "false" spec: diff --git a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-source.yaml b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-source.yaml index 2612707b84..64d1a8a912 100644 --- a/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-source.yaml +++ b/cmd/operator/kodata/eventing-source/1.15/kafka/eventing-kafka-source.yaml @@ -17,7 +17,7 @@ metadata: name: config-kafka-source-data-plane namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" annotations: knative.dev/example-checksum: "8157ecb1" data: @@ -178,7 +178,7 @@ kind: ClusterRole metadata: name: knative-kafka-source-data-plane labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" rules: - apiGroups: - "" @@ -215,7 +215,7 @@ metadata: name: knative-kafka-source-data-plane namespace: knative-eventing labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" --- # Copyright 2021 The Knative Authors @@ -236,7 +236,7 @@ kind: ClusterRoleBinding metadata: name: knative-kafka-source-data-plane labels: - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" subjects: - kind: ServiceAccount name: knative-kafka-source-data-plane @@ -267,7 +267,7 @@ metadata: namespace: knative-eventing labels: app: kafka-source-dispatcher - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-source-dispatcher app.kubernetes.io/name: knative-eventing spec: @@ -281,7 +281,7 @@ spec: name: kafka-source-dispatcher labels: app: kafka-source-dispatcher - app.kubernetes.io/version: "d1e6cb41e2fb2093c520974c3a7e7d1e53f19139" + app.kubernetes.io/version: "7092bb9079036d981e6c0e11cd6f959eef0e843b" app.kubernetes.io/component: kafka-channel-dispatcher app.kubernetes.io/name: knative-eventing app.kubernetes.io/kind: kafka-dispatcher @@ -308,7 +308,7 @@ spec: runAsUser: 1001 containers: - name: kafka-source-dispatcher - image: gcr.io/knative-releases/knative-kafka-broker-dispatcher-loom@sha256:0bc6c4e3c172ed9bc18563f4c110e1e0ac0ffd475cac76951a10c425ce30879f + image: gcr.io/knative-releases/knative-kafka-broker-dispatcher-loom@sha256:acdc8c6a5125f46aaefe1a8f0eeaccc531ae611e6c92ff88109651c49b187c64 imagePullPolicy: IfNotPresent volumeMounts: - mountPath: /etc/config diff --git a/go.mod b/go.mod index ec42ebc01d..6e74fcfa28 100644 --- a/go.mod +++ b/go.mod @@ -21,10 +21,10 @@ require ( k8s.io/client-go v0.29.2 k8s.io/code-generator v0.29.2 knative.dev/caching v0.0.0-20240716132144-989f54c83776 - knative.dev/eventing v0.42.0 - knative.dev/hack v0.0.0-20240814130635-06f7aff93954 + knative.dev/eventing v0.42.3 + knative.dev/hack v0.0.0-20240814135050-f9643117f6a1 knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 - knative.dev/serving v0.42.1 + knative.dev/serving v0.42.2 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index c004e38784..7d0d285a07 100644 --- a/go.sum +++ b/go.sum @@ -1361,16 +1361,16 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/caching v0.0.0-20240716132144-989f54c83776 h1:2nINnWuXtb9e2nG/EJxSCeghcmu6qmvmomJ7woiP5Is= knative.dev/caching v0.0.0-20240716132144-989f54c83776/go.mod h1:Uj74eO9rLiK1eb8wmDBED1hJBZQ7MJ9cvq/d8Ktsm3c= -knative.dev/eventing v0.42.0 h1:pbPPhV4JlgpHBZxLBhJTUf+4HuZe5y/zlkOGHZfvtZ0= -knative.dev/eventing v0.42.0/go.mod h1:hW5BMYcihtCelT9pqaMtK8gmNOo1ybxcigjBY+/fU+k= -knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM= -knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/eventing v0.42.3 h1:ubG0XApByn8xnT40XFIUlhVfbREWWG4SAnq9CiVtGLc= +knative.dev/eventing v0.42.3/go.mod h1:hW5BMYcihtCelT9pqaMtK8gmNOo1ybxcigjBY+/fU+k= +knative.dev/hack v0.0.0-20240814135050-f9643117f6a1 h1:3l9x2gly9549Mn+HFWlyf+r/mBYXkcEpBQGaWz6rRJM= +knative.dev/hack v0.0.0-20240814135050-f9643117f6a1/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556 h1:9OTyJkrjiFh/burZiti3WucGv8Qtt91VJTnXfO5dC2g= knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556/go.mod h1:1PosUDkXqoHNzYxtLIwa7LFqSsIXBShHOseAb6XBeEU= knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE= knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw= -knative.dev/serving v0.42.1 h1:iDx0eYAFRcWYPZ0gizu5lqXDAZ+hSGrUXHrFGiop1KM= -knative.dev/serving v0.42.1/go.mod h1:3cgU8/864RcqA0ZPrc3jFcmS3uJL/mOlUZiYsXonwaE= +knative.dev/serving v0.42.2 h1:yKieg3MeNvpVz+4JJPbvmpee3v3LK3zO5h5HJBtzaNk= +knative.dev/serving v0.42.2/go.mod h1:3cgU8/864RcqA0ZPrc3jFcmS3uJL/mOlUZiYsXonwaE= 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= diff --git a/vendor/knative.dev/hack/boilerplate.go.txt b/vendor/knative.dev/hack/boilerplate.go.txt deleted file mode 100644 index 8fb5f9cdf5..0000000000 --- a/vendor/knative.dev/hack/boilerplate.go.txt +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright #{YEAR} 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 - - http://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. -*/ diff --git a/vendor/knative.dev/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh index 01a43132dc..5f713dd436 100644 --- a/vendor/knative.dev/hack/codegen-library.sh +++ b/vendor/knative.dev/hack/codegen-library.sh @@ -16,156 +16,21 @@ # Setup the env for doing Knative style codegen. -# Store Bash options -oldstate="$(set +o)" - -set -Eeuo pipefail - -export repodir kn_hack_dir kn_hack_library \ - MODULE_NAME CODEGEN_TMP_GOPATH CODEGEN_ORIGINAL_GOPATH GOPATH GOBIN \ - CODEGEN_PKG KNATIVE_CODEGEN_PKG - -kn_hack_dir="$(realpath "$(dirname "${BASH_SOURCE[0]:-$0}")")" -kn_hack_library=${kn_hack_library:-"${kn_hack_dir}/library.sh"} +kn_hack_library=${kn_hack_library:-"$(dirname $0)/../vendor/knative.dev/hack/library.sh"} if [[ -f "$kn_hack_library" ]]; then - # shellcheck disable=SC1090 - source "$kn_hack_library" + source $kn_hack_library else - echo "The \$kn_hack_library points to a non-existent file: $kn_hack_library" >&2 - exit 42 + echo "this file is intended to be imported from a golang project that vendors knative.dev/hack" + exit fi -repodir="$(go_run knative.dev/toolbox/modscope@latest current --path)" - -function go-resolve-pkg-dir() { - local pkg="${1:?Pass the package name}" - local pkgdir - if [ -d "${repodir}/vendor" ]; then - pkgdir="${repodir}/vendor/${pkg}" - if [ -d "${pkgdir}" ]; then - echo "${pkgdir}" - return 0 - else - return 1 - fi - else - go mod download -x > /dev/stderr - go list -m -f '{{.Dir}}' "${pkg}" 2>/dev/null - return $? - fi -} - -# Change dir to the original executing script's directory, not the current source! -pushd "$(dirname "$(realpath "$0")")" > /dev/null - -if ! CODEGEN_PKG="${CODEGEN_PKG:-"$(go-resolve-pkg-dir k8s.io/code-generator)"}"; then - warning "Failed to determine the k8s.io/code-generator package" -fi -if ! KNATIVE_CODEGEN_PKG="${KNATIVE_CODEGEN_PKG:-"$(go-resolve-pkg-dir knative.dev/pkg)"}"; then - warning "Failed to determine the knative.dev/pkg package" -fi - -popd > /dev/null - -CODEGEN_ORIGINAL_GOPATH="$(go env GOPATH)" -CODEGEN_TMP_GOPATH=$(go_mod_gopath_hack) -GOPATH="${CODEGEN_TMP_GOPATH}" -GOBIN="${GOPATH}/bin" # Set GOBIN explicitly as k8s-gen' are installed by go install. - -if [[ -n "${CODEGEN_PKG}" ]] && ! [ -x "${CODEGEN_PKG}/generate-groups.sh" ]; then - chmod +x "${CODEGEN_PKG}/generate-groups.sh" - chmod +x "${CODEGEN_PKG}/generate-internal-groups.sh" -fi -if [[ -n "${KNATIVE_CODEGEN_PKG}" ]] && ! [ -x "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" ]; then - chmod +x "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" -fi - -# Generate boilerplate file with the current year -function boilerplate() { - local go_header_file="${kn_hack_dir}/boilerplate.go.txt" - local current_boilerplate_file="${TMPDIR}/boilerplate.go.txt" - # Replace #{YEAR} with the current year - sed "s/#{YEAR}/$(date +%Y)/" \ - < "${go_header_file}" \ - > "${current_boilerplate_file}" - echo "${current_boilerplate_file}" -} - -# Generate K8s' groups codegen -function generate-groups() { - if [[ -z "${CODEGEN_PKG}" ]]; then - abort "CODEGEN_PKG is not set" - fi - "${CODEGEN_PKG}"/generate-groups.sh \ - "$@" \ - --go-header-file "$(boilerplate)" -} - -# Generate K8s' internal groups codegen -function generate-internal-groups() { - if [[ -z "${CODEGEN_PKG}" ]]; then - abort "CODEGEN_PKG is not set" - fi - "${CODEGEN_PKG}"/generate-internal-groups.sh \ - "$@" \ - --go-header-file "$(boilerplate)" -} - -# Generate Knative style codegen -function generate-knative() { - if [[ -z "${KNATIVE_CODEGEN_PKG}" ]]; then - abort "KNATIVE_CODEGEN_PKG is not set" - fi - "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" \ - "$@" \ - --go-header-file "$(boilerplate)" -} - -# Cleanup after generating code -function cleanup-codegen() { - restore-changes-if-its-copyright-year-only - restore-gopath -} - -# Restore changes if the file contains only the change in the copyright year -function restore-changes-if-its-copyright-year-only() { - local difflist - log "Cleaning up generated code" - difflist="$(mktemp)" - git diff --exit-code --name-only > "$difflist" - # list git changes and skip those which differ only in the boilerplate year - while read -r file; do - # check if the file contains just the change in the boilerplate year - if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \ - [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then - # restore changes to that file - git checkout -- "$file" - fi - done < "$difflist" - rm -f "$difflist" -} - -# Restore the GOPATH and clean up the temporary directory -function restore-gopath() { - # Skip this if the directory is already checked out onto the GOPATH. - if __is_checkout_onto_gopath; then - return - fi - if [ -d "$CODEGEN_TMP_GOPATH" ]; then - chmod -R u+w "${CODEGEN_TMP_GOPATH}" - rm -rf "${CODEGEN_TMP_GOPATH}" - unset CODEGEN_TMP_GOPATH - fi - unset GOPATH GOBIN - # Restore the original GOPATH, if it was different from the default one. - if [ "$CODEGEN_ORIGINAL_GOPATH" != "$(go env GOPATH)" ]; then - export GOPATH="$CODEGEN_ORIGINAL_GOPATH" - fi - unset CODEGEN_ORIGINAL_GOPATH -} - -add_trap cleanup-codegen EXIT +export MODULE_NAME=$(go_mod_module_name) +export GOPATH=$(go_mod_gopath_hack) +export GOBIN=${GOPATH}/bin # Set GOBIN explicitly as deepcopy-gen is installed by go install. +export CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} +export KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo "${REPO_ROOT_DIR}")} -# Restore Bash options -eval "$oldstate" +[ -x ${CODEGEN_PKG}/generate-groups.sh ] || chmod +x ${CODEGEN_PKG}/generate-groups.sh +[ -x ${CODEGEN_PKG}/generate-internal-groups.sh ] || chmod +x ${CODEGEN_PKG}/generate-internal-groups.sh +[ -x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh ] || chmod +x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh diff --git a/vendor/knative.dev/hack/embed.go b/vendor/knative.dev/hack/embed.go index aedb546df1..62f856ec68 100644 --- a/vendor/knative.dev/hack/embed.go +++ b/vendor/knative.dev/hack/embed.go @@ -20,5 +20,5 @@ import ( "embed" ) -//go:embed *.sh *.go.txt +//go:embed *.sh var Scripts embed.FS diff --git a/vendor/knative.dev/hack/go.work b/vendor/knative.dev/hack/go.work index 0c69c9e28d..b6265ad9e2 100644 --- a/vendor/knative.dev/hack/go.work +++ b/vendor/knative.dev/hack/go.work @@ -1,4 +1,4 @@ -go 1.21 +go 1.18 use ( . diff --git a/vendor/knative.dev/hack/go.work.sum b/vendor/knative.dev/hack/go.work.sum index f8a39b236e..1cc0cde937 100644 --- a/vendor/knative.dev/hack/go.work.sum +++ b/vendor/knative.dev/hack/go.work.sum @@ -1,102 +1,61 @@ +cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= -github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= -github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA= -github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os= -github.com/alecthomas/mango-kong v0.1.0 h1:iFVfP1k1K4qpml3JUQmD5I8MCQYfIvsD9mRdrw7jJC4= -github.com/alecthomas/mango-kong v0.1.0/go.mod h1:t+TYVdsONUolf/BwVcm+15eqcdAj15h4Qe9MMFAwwT4= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= -github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= -github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA= -github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= -github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= -github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= -github.com/charmbracelet/bubbletea v0.26.3 h1:iXyGvI+FfOWqkB2V07m1DF3xxQijxjY2j8PqiXYqasg= -github.com/charmbracelet/bubbletea v0.26.3/go.mod h1:bpZHfDHTYJC5g+FBK+ptJRCQotRC+Dhh3AoMxa/2+3Q= -github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng= -github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps= -github.com/charmbracelet/huh v0.4.2 h1:5wLkwrA58XDAfEZsJzNQlfJ+K8N9+wYwvR5FOM7jXFM= -github.com/charmbracelet/huh v0.4.2/go.mod h1:g9OXBgtY3zRV4ahnVih9bZE+1yGYN+y2C9Q6L2P+WM0= -github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM= -github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM= -github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e h1:DhvN6ye3nHLhRtNHtlrQ0Zk+vmeN7YtEnyIRfcl7e0E= -github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= -github.com/charmbracelet/x/input v0.1.1 h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4= -github.com/charmbracelet/x/input v0.1.1/go.mod h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0= -github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI= -github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw= -github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg= -github.com/charmbracelet/x/windows v0.1.2/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ= +github.com/PuerkitoBio/purell v1.0.0 h1:0GoNN3taZV6QI81IXgCbxMyEaJDXMSIjArYBCYzVVvs= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 h1:JCHLVE3B+kJde7bIEo5N4J+ZbLhp0J1Fs+ulyRws4gE= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= -github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= -github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= -github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= -github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= -github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 h1:ZktWZesgun21uEDrwW7iEV1zPCGQldM2atlJZ3TdvVM= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1 h1:wSt/4CYxs70xbATrGXhokKF1i0tZjENLOo1ioIO13zk= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9 h1:tF+augKRWlWx0J0B7ZyyKSiTyV6E1zZe+7b3qQlcEf8= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501 h1:C1JKChikHGpXwT5UQDFaryIpDtyyGL/CR6C2kB7F1oc= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87 h1:zP3nY8Tk2E6RTkqGYrarZXuzh+ffyLDljLxCy1iJw80= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA= +github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= -github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= -github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= -github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= -github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= -github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= -github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= -github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= -github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= -github.com/muesli/mango v0.2.0 h1:iNNc0c5VLQ6fsMgAqGQofByNUBH2Q2nEbD6TaI+5yyQ= -github.com/muesli/mango v0.2.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4= -github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= -github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= -github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= -github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a h1:TpvdAwDAt1K4ANVOfcihouRdvP+MgAfDWwBuct4l6ZY= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= +github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA= -github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= -github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= -github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s= -github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d h1:N0hmiNbwsSNwHBAvR3QB5w25pUwH4tK0Y/RltD1j1h4= -golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= +google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= +google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac h1:sAvhNk5RRuc6FNYGqe7Ygz3PSo/2wGWbulskmzRX8Vs= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 08f2dba16f..e5d21b70e6 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -138,72 +138,18 @@ function calcRetcode() { echo "$rc" } -# Print error message. -# Parameters: $* - error message to be displayed -function error() { - local first="$1" - shift - local args=("ERROR: $first" "$@") - gum_banner \ - --color '#D00' \ - --padding '1 3' \ - --border double \ - "${args[@]}" > /dev/stderr -} - # Print error message and call exit(n) where n calculated from the error message. # Parameters: $1..$n - error message to be displayed # Globals: abort_retcode will change the default retcode to be returned function abort() { - error "$@" + make_banner '*' "ERROR: $*" >&2 readonly abort_retcode="${abort_retcode:-$(calcRetcode "$*")}" exit "$abort_retcode" } -# Simple header for logging purposes. -function header() { - local upper - upper="$(echo "$*" | tr '[:lower:]' '[:upper:]')" - gum_banner \ - --border double \ - --color 44 \ - --padding '1 3' \ - "$upper" -} - -# Simple subheader for logging purposes. -function subheader() { - gum_banner \ - --color 45 \ - "$@" -} - -# Simple log step for logging purposes. -function log.step() { - echo "=== $*" | gum_style --foreground 44 -} - -# Simple log for logging purposes. -function log() { - echo "--- $*" | gum_style --foreground 45 -} - -# Simple warning banner for logging purposes. -function warning() { - local first="$1" - shift - local args=("WARN: $first" "$@") - gum_banner \ - --color '#DD0' \ - --padding '1 3' \ - --border rounded \ - "${args[@]}" > /dev/stderr -} - # Display a box banner. # Parameters: $1 - character to use for the box. # $2 - banner message. -# Deprecated: Use `gum_banner` instead. function make_banner() { local msg="$1$1$1$1 $2 $1$1$1$1" local border="${msg//[^$1]/$1}" @@ -215,62 +161,25 @@ function make_banner() { fi } -# Display a fancy box banner. -# Parameters: -# [--border ] - a gum border type for the box, defaults to 'rounded' -# [--color ] - a gum color for the box, defaults to '0'' -# [--padding ] - a gum padding for the box, defaults to '0 1' -# $* - banner message. -function gum_banner() { - local border='rounded' - local color='0' - local padding='0 1' - while [[ $# -gt 0 ]]; do - case "$1" in - --border) - border="$2" - shift 2 - ;; - --color) - color="$2" - shift 2 - ;; - --padding) - padding="$2" - shift 2 - ;; - *) - break - ;; - esac - done - local args=( - --align center - --border "$border" - --foreground "$color" - --border-foreground "$color" - --padding "$padding" - "$@" - ) - # TODO: Remove once logs have timestamps on Prow, details see: - # https://github.com/kubernetes/test-infra/issues/10100 - if (( IS_PROW )); then - local dt - # RFC3339Nano format with 3 digits of ns without timezone offset - dt="$(TZ='UTC' date --rfc-3339=ns | sed -E 's/\.([0-9]{3})[0-9]+.+$/.\1/')" - args+=('' "at $dt") - fi - gum_style "${args[@]}" +# Simple header for logging purposes. +function header() { + local upper="$(echo $1 | tr a-z A-Z)" + make_banner "=" "${upper}" } -# Simple info banner for logging purposes. -function gum_style() { - go_run github.com/charmbracelet/gum@v0.14.1 style "$@" +# Simple subheader for logging purposes. +function subheader() { + make_banner "-" "$1" +} + +# Simple warning banner for logging purposes. +function warning() { + make_banner '!' "WARN: $*" >&2 } # Checks whether the given function exists. function function_exists() { - [[ "$(type -t "$1")" == "function" ]] + [[ "$(type -t $1)" == "function" ]] } # GitHub Actions aware output grouping. @@ -278,7 +187,7 @@ function group() { # End the group is there is already a group. if [ -z ${__GROUP_TRACKER+x} ]; then export __GROUP_TRACKER="grouping" - add_trap end_group EXIT + trap end_group EXIT else end_group fi @@ -289,10 +198,10 @@ function group() { # GitHub Actions aware output grouping. function start_group() { if [[ -n ${GITHUB_WORKFLOW:-} ]]; then - echo "::group::$*" - add_trap end_group EXIT + echo "::group::$@" + trap end_group EXIT else - log "$@" + echo "--- $@" fi } @@ -608,7 +517,7 @@ function report_go_test() { echo "Test log (ANSI) written to ${ansilog}" htmllog="${logfile/.jsonl/.html}" - go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.10.0 \ + go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.11.0 \ --preview < "$ansilog" > "$htmllog" echo "Test log (HTML) written to ${htmllog}" @@ -773,18 +682,18 @@ function go_update_deps() { function __clean_goworksum_if_exists() { if [ -f "$REPO_ROOT_DIR/go.work.sum" ]; then - log.step 'Cleaning the go.work.sum file' - truncate --size 0 "$REPO_ROOT_DIR/go.work.sum" + echo "=== Cleaning the go.work.sum file" + true > "$REPO_ROOT_DIR/go.work.sum" fi } function __remove_goworksum_if_empty() { if [ -f "$REPO_ROOT_DIR/go.work" ]; then - log.step 'Syncing the go workspace' + echo "=== Syncing the go workspace" go work sync fi if ! [ -s "$REPO_ROOT_DIR/go.work.sum" ]; then - log.step 'Removing empty go.work.sum' + echo "=== Removing empty go.work.sum" rm -f "$REPO_ROOT_DIR/go.work.sum" fi } @@ -797,7 +706,7 @@ function __go_update_deps_for_module() { export GONOSUMDB="${GONOSUMDB:-},knative.dev/*" export GONOPROXY="${GONOPROXY:-},knative.dev/*" - log.step "Update Deps for Golang module: $(go_mod_module_name)" + echo "=== Update Deps for Golang module: $(go_mod_module_name)" local UPGRADE=0 local RELEASE="v9000.1" # release v9000 is so far in the future, it will always pick the default branch. @@ -843,12 +752,7 @@ function __go_update_deps_for_module() { if [[ "${FORCE_VENDOR:-false}" == "true" ]] || [ -d vendor ]; then group "Go mod vendor" - # Call go work vendor for Go 1.22+ and go.work file exists. - if [ -f "$REPO_ROOT_DIR/go.work" ] && go help work vendor &>/dev/null; then - go work vendor - else - go mod vendor - fi + go mod vendor 2>&1 | grep -v "ignoring symlink" || true else go mod download -x fi @@ -881,32 +785,22 @@ function go_mod_module_name() { go_run knative.dev/toolbox/modscope@latest current } -function __is_checkout_onto_gopath() { - ! [ "${REPO_ROOT_DIR##"$(go env GOPATH)"}" = "$REPO_ROOT_DIR" ] -} - # Return a GOPATH to a temp directory. Works around the out-of-GOPATH issues # for k8s client gen mixed with go mod. # Intended to be used like: # export GOPATH=$(go_mod_gopath_hack) function go_mod_gopath_hack() { - # Skip this if the directory is already checked out onto the GOPATH. - if __is_checkout_onto_gopath; then + # Skip this if the directory is already checked out onto the GOPATH. + if [[ "${REPO_ROOT_DIR##$(go env GOPATH)}" != "$REPO_ROOT_DIR" ]]; then go env GOPATH return fi - local TMP_GOPATH TMP_REPO_PATH - TMP_GOPATH="$TMPDIR/go" - TMP_REPO_PATH="${TMP_GOPATH}/src/$(go_mod_module_name)" - if [ -d "${TMP_REPO_PATH}" ]; then - echo "${TMP_GOPATH}" - return - fi - mkdir -p "$(dirname "${TMP_REPO_PATH}")" - ln -s "${REPO_ROOT_DIR}" "${TMP_REPO_PATH}" + local TMP_DIR="$(mktemp -d)" + local TMP_REPO_PATH="${TMP_DIR}/src/$(go_mod_module_name)" + mkdir -p "$(dirname "${TMP_REPO_PATH}")" && ln -s "${REPO_ROOT_DIR}" "${TMP_REPO_PATH}" - echo "${TMP_GOPATH}" + echo "${TMP_DIR}" } # Run kntest tool @@ -1120,7 +1014,6 @@ function latest_version() { # Initializations that depend on previous functions. # These MUST come last. -MODULE_NAME="$(go_mod_module_name)" readonly _TEST_INFRA_SCRIPTS_DIR="$(dirname $(get_canonical_path "${BASH_SOURCE[0]}"))" readonly REPO_NAME_FORMATTED="Knative $(capitalize "${REPO_NAME//-/ }")" diff --git a/vendor/knative.dev/hack/presubmit-tests.sh b/vendor/knative.dev/hack/presubmit-tests.sh index b96ffadf43..d210dc703f 100644 --- a/vendor/knative.dev/hack/presubmit-tests.sh +++ b/vendor/knative.dev/hack/presubmit-tests.sh @@ -72,11 +72,9 @@ function initialize_environment() { # Parameters: $1 - test group name (e.g., build) # $2 - result (0=passed, 1=failed) function results_banner() { - if [[ $2 -eq 0 ]]; then - header "$1 tests PASSED" - else - error "$1 tests FAILED" - fi + local result + [[ $2 -eq 0 ]] && result="PASSED" || result="FAILED" + header "$1 tests ${result}" } # Run build tests. If there's no `build_tests` function, run the default diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 450c0671b1..da1a6f55c0 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -17,7 +17,7 @@ # This is a helper script for Knative release scripts. # See README.md for instructions on how to use it. -source "$(dirname "${BASH_SOURCE[0]}")/library.sh" +source $(dirname "${BASH_SOURCE[0]}")/library.sh # Organization name in GitHub; defaults to Knative. readonly ORG_NAME="${ORG_NAME:-knative}" @@ -34,9 +34,9 @@ readonly NIGHTLY_SIGNING_IDENTITY="signer@knative-nightly.iam.gserviceaccount.co readonly RELEASE_SIGNING_IDENTITY="signer@knative-releases.iam.gserviceaccount.com" # Simple banner for logging purposes. -# Parameters: $* - message to display. +# Parameters: $1 - message to display. function banner() { - subheader "$*" + make_banner "@" "$1" } # Copy the given files to the $RELEASE_GCS_BUCKET bucket's "latest" directory. diff --git a/vendor/modules.txt b/vendor/modules.txt index b47f03d6d9..6de9514082 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1323,7 +1323,7 @@ k8s.io/utils/trace ## explicit; go 1.22 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.42.0 +# knative.dev/eventing v0.42.3 ## explicit; go 1.22 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -1431,8 +1431,8 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher knative.dev/eventing/test/upgrade/prober/wathola/forwarder knative.dev/eventing/test/upgrade/prober/wathola/receiver knative.dev/eventing/test/upgrade/prober/wathola/sender -# knative.dev/hack v0.0.0-20240814130635-06f7aff93954 -## explicit; go 1.21 +# knative.dev/hack v0.0.0-20240814135050-f9643117f6a1 +## explicit; go 1.18 knative.dev/hack # knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556 ## explicit; go 1.22 @@ -1533,7 +1533,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/serving v0.42.1 +# knative.dev/serving v0.42.2 ## explicit; go 1.22 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1