Run make generate-release (#885)

Co-authored-by: mgencur <[email protected]>
openshift-knative · Oct 26, 2023 · 2d71075 · 2d71075
1 parent 1441071
commit 2d71075
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 46 deletions.
diff --git 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
@@ -1054,22 +1054,15 @@ 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:
     - name: v1alpha1
       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,15 +1109,22 @@ 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:
     - name: v1alpha1
       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
@@ -1054,22 +1054,15 @@ 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:
     - name: v1alpha1
       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,15 +1109,22 @@ 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:
     - name: v1alpha1
       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
diff --git a/vendor/knative.dev/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh