From 2d710750f81c9a6323c0b26dfc65d400b7fcff70 Mon Sep 17 00:00:00 2001 From: Serverless QE Robot <86025630+serverless-qe@users.noreply.github.com> Date: Thu, 26 Oct 2023 08:55:06 +0200 Subject: [PATCH] Run `make generate-release` (#885) Co-authored-by: mgencur --- openshift/ci-operator/source-image/Dockerfile | 2 + .../artifacts/eventing-kafka-controller.yaml | 46 +++++++++---------- .../release/artifacts/eventing-kafka.yaml | 46 +++++++++---------- .../k8s.io/code-generator/generate-groups.sh | 0 .../knative.dev/pkg/hack/generate-knative.sh | 0 5 files changed, 48 insertions(+), 46 deletions(-) mode change 100755 => 100644 vendor/k8s.io/code-generator/generate-groups.sh mode change 100755 => 100644 vendor/knative.dev/pkg/hack/generate-knative.sh diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 3750d86255..b5fb40035f 100755 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -1,3 +1,5 @@ # DO NOT EDIT! Generated Dockerfile. FROM src + +RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh vendor/knative.dev/pkg/hack/generate-knative.sh || true diff --git a/openshift/release/artifacts/eventing-kafka-controller.yaml b/openshift/release/artifacts/eventing-kafka-controller.yaml index 139e231afb..4d63e2a28d 100644 --- a/openshift/release/artifacts/eventing-kafka-controller.yaml +++ b/openshift/release/artifacts/eventing-kafka-controller.yaml @@ -1054,7 +1054,7 @@ metadata: labels: app.kubernetes.io/version: v1.11 knative.dev/crd-install: "true" - name: consumergroups.internal.kafka.eventing.knative.dev + name: consumers.internal.kafka.eventing.knative.dev spec: group: internal.kafka.eventing.knative.dev versions: @@ -1062,14 +1062,7 @@ spec: served: true storage: true subresources: - status: {} - scale: - # specReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Spec.Replicas. - specReplicasPath: .spec.replicas - # statusReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Replicas. - statusReplicasPath: .status.replicas - # labelSelectorPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Selector - labelSelectorPath: .status.selector + status: { } schema: openAPIV3Schema: type: object @@ -1086,19 +1079,13 @@ spec: - name: Subscriber type: string jsonPath: .status.subscriberUri - - name: Replicas - type: string - jsonPath: .spec.replicas - - name: Ready Replicas - type: string - jsonPath: .status.replicas - name: Age type: date jsonPath: .metadata.creationTimestamp names: - kind: ConsumerGroup - plural: consumergroups - singular: consumergroup + kind: Consumer + plural: consumers + singular: consumer scope: Namespaced --- # Copyright 2021 The Knative Authors @@ -1122,7 +1109,7 @@ metadata: labels: app.kubernetes.io/version: v1.11 knative.dev/crd-install: "true" - name: consumers.internal.kafka.eventing.knative.dev + name: consumergroups.internal.kafka.eventing.knative.dev spec: group: internal.kafka.eventing.knative.dev versions: @@ -1130,7 +1117,14 @@ spec: served: true storage: true subresources: - status: { } + status: {} + scale: + # specReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Spec.Replicas. + specReplicasPath: .spec.replicas + # statusReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Replicas. + statusReplicasPath: .status.replicas + # labelSelectorPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Selector + labelSelectorPath: .status.selector schema: openAPIV3Schema: type: object @@ -1147,13 +1141,19 @@ spec: - name: Subscriber type: string jsonPath: .status.subscriberUri + - name: Replicas + type: string + jsonPath: .spec.replicas + - name: Ready Replicas + type: string + jsonPath: .status.replicas - name: Age type: date jsonPath: .metadata.creationTimestamp names: - kind: Consumer - plural: consumers - singular: consumer + kind: ConsumerGroup + plural: consumergroups + singular: consumergroup scope: Namespaced --- # Copyright 2022 The Knative Authors diff --git a/openshift/release/artifacts/eventing-kafka.yaml b/openshift/release/artifacts/eventing-kafka.yaml index 75eaf0870b..01baaea2aa 100644 --- a/openshift/release/artifacts/eventing-kafka.yaml +++ b/openshift/release/artifacts/eventing-kafka.yaml @@ -1054,7 +1054,7 @@ metadata: labels: app.kubernetes.io/version: v1.11 knative.dev/crd-install: "true" - name: consumergroups.internal.kafka.eventing.knative.dev + name: consumers.internal.kafka.eventing.knative.dev spec: group: internal.kafka.eventing.knative.dev versions: @@ -1062,14 +1062,7 @@ spec: served: true storage: true subresources: - status: {} - scale: - # specReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Spec.Replicas. - specReplicasPath: .spec.replicas - # statusReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Replicas. - statusReplicasPath: .status.replicas - # labelSelectorPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Selector - labelSelectorPath: .status.selector + status: { } schema: openAPIV3Schema: type: object @@ -1086,19 +1079,13 @@ spec: - name: Subscriber type: string jsonPath: .status.subscriberUri - - name: Replicas - type: string - jsonPath: .spec.replicas - - name: Ready Replicas - type: string - jsonPath: .status.replicas - name: Age type: date jsonPath: .metadata.creationTimestamp names: - kind: ConsumerGroup - plural: consumergroups - singular: consumergroup + kind: Consumer + plural: consumers + singular: consumer scope: Namespaced --- # Copyright 2021 The Knative Authors @@ -1122,7 +1109,7 @@ metadata: labels: app.kubernetes.io/version: v1.11 knative.dev/crd-install: "true" - name: consumers.internal.kafka.eventing.knative.dev + name: consumergroups.internal.kafka.eventing.knative.dev spec: group: internal.kafka.eventing.knative.dev versions: @@ -1130,7 +1117,14 @@ spec: served: true storage: true subresources: - status: { } + status: {} + scale: + # specReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Spec.Replicas. + specReplicasPath: .spec.replicas + # statusReplicasPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Replicas. + statusReplicasPath: .status.replicas + # labelSelectorPath defines the JSONPath inside a custom resource that corresponds to Scale.Status.Selector + labelSelectorPath: .status.selector schema: openAPIV3Schema: type: object @@ -1147,13 +1141,19 @@ spec: - name: Subscriber type: string jsonPath: .status.subscriberUri + - name: Replicas + type: string + jsonPath: .spec.replicas + - name: Ready Replicas + type: string + jsonPath: .status.replicas - name: Age type: date jsonPath: .metadata.creationTimestamp names: - kind: Consumer - plural: consumers - singular: consumer + kind: ConsumerGroup + plural: consumergroups + singular: consumergroup scope: Namespaced --- # Copyright 2022 The Knative Authors diff --git a/vendor/k8s.io/code-generator/generate-groups.sh b/vendor/k8s.io/code-generator/generate-groups.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh old mode 100755 new mode 100644