From f16ee5f07bb9718ffa039284c15ea57a03b78fd2 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 24 Sep 2024 17:21:02 -0400 Subject: [PATCH] upgrade to latest dependencies (#1896) bumping knative.dev/reconciler-test 0cb8938...13c0118: > 13c0118 Handle resource already exists in Apply (# 759) Signed-off-by: Knative Automation --- .../1.15/kafka/eventing-kafka-controller.yaml | 76 ++++++++++--------- .../kafka/eventing-kafka-post-install.yaml | 24 +++--- .../1.15/kafka/eventing-kafka-source.yaml | 14 ++-- go.mod | 2 +- go.sum | 4 +- .../reconciler-test/pkg/manifest/manifest.go | 7 +- vendor/modules.txt | 2 +- 7 files changed, 69 insertions(+), 60 deletions(-) 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 6457d7e64..e927406ce 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" spec: group: eventing.knative.dev names: @@ -711,7 +711,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" annotations: knative.dev/example-checksum: "b6ed351d" data: @@ -1260,7 +1260,7 @@ metadata: name: config-kafka-autoscaler namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" data: predicates: | [] @@ -1363,7 +1363,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" data: predicates: | [ @@ -1470,7 +1470,7 @@ metadata: name: kafka-config-logging namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" data: config.xml: | @@ -1532,7 +1532,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" rules: - apiGroups: - "" @@ -1962,7 +1962,7 @@ metadata: name: kafka-controller namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" --- # Copyright 2020 The Knative Authors @@ -1983,7 +1983,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" subjects: - kind: ServiceAccount name: kafka-controller @@ -1998,7 +1998,7 @@ kind: ClusterRoleBinding metadata: name: kafka-controller-addressable-resolver labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" subjects: - kind: ServiceAccount name: kafka-controller @@ -2029,7 +2029,7 @@ metadata: namespace: knative-eventing labels: app: kafka-controller - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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:03c2243df1439614a3f9b9f8be02a90ced11094cf6d1b866defc89fa87013ebe + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/kafka-controller@sha256:c3ecf4f8f77c646b380c1d23986e0ebcbeac8b533127149ec818966515b7eb2a imagePullPolicy: IfNotPresent env: - name: BROKER_DATA_PLANE_CONFIG_MAP_NAMESPACE @@ -2164,6 +2164,12 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + - name: ENABLE_SARAMA_LOGGER + value: "false" + - name: ENABLE_SARAMA_DEBUG_LOGGER + value: "false" + - name: ENABLE_SARAMA_CLIENT_POOL + value: "true" ports: - containerPort: 9090 name: metrics @@ -2202,7 +2208,7 @@ kind: ClusterRole metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" rules: # For watching logging configuration and getting certs. - apiGroups: @@ -2304,7 +2310,7 @@ metadata: name: kafka-webhook-eventing namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" --- # Copyright 2020 The Knative Authors @@ -2325,7 +2331,7 @@ kind: ClusterRoleBinding metadata: name: kafka-webhook-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" subjects: - kind: ServiceAccount name: kafka-webhook-eventing @@ -2355,7 +2361,7 @@ kind: MutatingWebhookConfiguration metadata: name: defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2387,7 +2393,7 @@ kind: MutatingWebhookConfiguration metadata: name: pods.defaulting.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" webhooks: # Dispatcher pods webhook config. - admissionReviewVersions: ["v1", "v1beta1"] @@ -2429,7 +2435,7 @@ metadata: name: kafka-webhook-eventing-certs namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" # The data is populated at install time. --- @@ -2452,7 +2458,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.kafka.eventing.knative.dev labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -2486,7 +2492,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2497,7 +2503,7 @@ spec: metadata: labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" app.kubernetes.io/component: kafka-webhook-eventing app.kubernetes.io/name: knative-eventing spec: @@ -2517,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:e8f6171912a6e30388b921259750363094759f4bd22f660dc7baabc1cfecc31f + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/webhook-kafka@sha256:ec8bbe0e79aedea6216a3f12cb0f37f71903f5c7c09265d3c7246110a12b4b9d resources: requests: cpu: 20m @@ -2587,7 +2593,7 @@ metadata: namespace: knative-eventing labels: app: kafka-webhook-eventing - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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 78769f572..f3d17f64a 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" --- # Copyright 2020 The Knative Authors @@ -78,7 +78,7 @@ kind: ClusterRole metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: knative-kafka-storage-version-migrator labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -237,7 +237,7 @@ spec: metadata: labels: app: kafka-controller-post-install - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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:7befc1123a326eabfbe6eae55820e30ae4e4227e84c352c46f3217cbfc71e0e4 + image: gcr.io/knative-releases/knative.dev/eventing-kafka-broker/control-plane/cmd/post-install@sha256:9038056ecde4ee9e9998ba55d5980c177b6229fd60b0eaa99be88e42c0384025 env: - name: SYSTEM_NAMESPACE valueFrom: @@ -285,7 +285,7 @@ metadata: namespace: knative-eventing labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 @@ -293,7 +293,7 @@ spec: metadata: labels: app: "knative-kafka-storage-version-migrator" - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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:308ac27ac7b3bbda53656a1d7dc4342bbc638d807df836d5ef038fc14e13868e + image: gcr.io/knative-releases/knative.dev/pkg/apiextensions/storageversion/cmd/migrate@sha256:fbf66aff7b5b9ab4276a29ab0bb5e1f101c1b09bc441809b15e62e891ae08cbd env: - name: IGNORE_NOT_FOUND value: "true" 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 3a133f4b5..506e32b81 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" rules: - apiGroups: - "" @@ -215,7 +215,7 @@ metadata: name: knative-kafka-source-data-plane namespace: knative-eventing labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" --- # Copyright 2021 The Knative Authors @@ -236,7 +236,7 @@ kind: ClusterRoleBinding metadata: name: knative-kafka-source-data-plane labels: - app.kubernetes.io/version: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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: "a7715ef98d623819cbe05154ae7eaabaa0667d0b" + app.kubernetes.io/version: "0c7738138dcfb45b5ba961e25249af740d64e630" 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:faed6ed437466cd46a6369ec2744f2a753b842d08542fd79ec4571cf32bc9356 + image: gcr.io/knative-releases/knative-kafka-broker-dispatcher-loom@sha256:449ba443ed5bbe1cb943085abd59a6331777b3a48ca1cfe60238c2f65d12e100 imagePullPolicy: IfNotPresent volumeMounts: - mountPath: /etc/config diff --git a/go.mod b/go.mod index 1ae137768..542285a33 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2 knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d knative.dev/pkg v0.0.0-20240923063442-aabe552ba5e6 - knative.dev/reconciler-test v0.0.0-20240919063827-0cb8938be2e4 + knative.dev/reconciler-test v0.0.0-20240924085229-13c0118a9d5c knative.dev/serving v0.42.1-0.20240923143026-59d17f1d93c7 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 5a5427f5d..8c88b5a75 100644 --- a/go.sum +++ b/go.sum @@ -1403,8 +1403,8 @@ knative.dev/networking v0.0.0-20240917132712-faa7309552e6 h1:+l+pAA1zEyqo2690EcE knative.dev/networking v0.0.0-20240917132712-faa7309552e6/go.mod h1:hn1SBZE0+jQRFhYhSgtKWcVrQcGkxfNXMxNkO8+ykq4= knative.dev/pkg v0.0.0-20240923063442-aabe552ba5e6 h1:3x7jZIppPg3PYUPq+tMUdfW1BIz1Do7Y/gWopZZKfg8= knative.dev/pkg v0.0.0-20240923063442-aabe552ba5e6/go.mod h1:IQi7fVFvQa6UpNnSpzlAiNPMtTvIj4MHj4vSD/PulCE= -knative.dev/reconciler-test v0.0.0-20240919063827-0cb8938be2e4 h1:64AsOs3D0kdTVC9eAtY7jbVh0BaCSZfTtMgIYaQWHgo= -knative.dev/reconciler-test v0.0.0-20240919063827-0cb8938be2e4/go.mod h1:nXvaMk3Czw2mi5J4A3aQNRi9aEJPJh/SQJdSL/8qBFM= +knative.dev/reconciler-test v0.0.0-20240924085229-13c0118a9d5c h1:X7k1ll3Ihv4cMhJ0vxKGo9Vv1hs5Qoer0RJKCDsXw5g= +knative.dev/reconciler-test v0.0.0-20240924085229-13c0118a9d5c/go.mod h1:nXvaMk3Czw2mi5J4A3aQNRi9aEJPJh/SQJdSL/8qBFM= knative.dev/serving v0.42.1-0.20240923143026-59d17f1d93c7 h1:8YvIhKmnRwjehYDQfwx0Uwd6EY/c6I/SV8RiW/eKYFk= knative.dev/serving v0.42.1-0.20240923143026-59d17f1d93c7/go.mod h1:668vDBizUH/DL5Zn/OjhSw8MkPvcTgRX2J3V9LU2AOE= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= diff --git a/vendor/knative.dev/reconciler-test/pkg/manifest/manifest.go b/vendor/knative.dev/reconciler-test/pkg/manifest/manifest.go index 2fc8f700e..8276d51c8 100644 --- a/vendor/knative.dev/reconciler-test/pkg/manifest/manifest.go +++ b/vendor/knative.dev/reconciler-test/pkg/manifest/manifest.go @@ -86,10 +86,14 @@ func (f *YamlManifest) Apply(spec *unstructured.Unstructured) error { if err != nil { return err } + gvr, _ := meta.UnsafeGuessKindToResource(spec.GroupVersionKind()) if current == nil { f.log.Info("Creating type ", spec.GroupVersionKind(), " name ", spec.GetName()) - gvr, _ := meta.UnsafeGuessKindToResource(spec.GroupVersionKind()) if _, err := f.client.Resource(gvr).Namespace(spec.GetNamespace()).Create(context.Background(), spec, v1.CreateOptions{}); err != nil { + // We might be applying the same resource in parallel, in that case, update the resource. + if errors.IsAlreadyExists(err) { + return f.Apply(spec) + } return fmt.Errorf("failed to create resource %v - Resource:\n%s", err, toYaml(spec)) } } else { @@ -97,7 +101,6 @@ func (f *YamlManifest) Apply(spec *unstructured.Unstructured) error { if UpdateChanged(spec.UnstructuredContent(), current.UnstructuredContent()) { f.log.Info("Updating type ", spec.GroupVersionKind(), " name ", spec.GetName()) - gvr, _ := meta.UnsafeGuessKindToResource(spec.GroupVersionKind()) if _, err = f.client.Resource(gvr).Namespace(current.GetNamespace()).Update(context.Background(), current, v1.UpdateOptions{}); err != nil { return fmt.Errorf("failed to update resource %v - Resource:\n%s", err, toYaml(spec)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index dd9157715..437889bb9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1551,7 +1551,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/reconciler-test v0.0.0-20240919063827-0cb8938be2e4 +# knative.dev/reconciler-test v0.0.0-20240924085229-13c0118a9d5c ## explicit; go 1.22.0 knative.dev/reconciler-test/cmd/eventshub knative.dev/reconciler-test/pkg/environment