[release-v3.28] Auto pick #9547: Remove CRDs from tigera-operator.yaml

Makefile

@@ -48,6 +48,7 @@ check-language:
 
 generate:
 	$(MAKE) gen-semaphore-yaml
+	$(MAKE) get-operator-crds
 	$(MAKE) -C api gen-files
 	$(MAKE) -C libcalico-go gen-files
 	$(MAKE) -C felix gen-files
@@ -61,12 +62,10 @@ gen-manifests: bin/helm
 		CALICO_VERSION=$(CALICO_VERSION) \
 		./generate.sh
 
-# Get operator CRDs from the operator repo, OPERATOR_BRANCH_NAME must be set
-get-operator-crds: var-require-all-OPERATOR_BRANCH_NAME
+# Get operator CRDs from the operator repo, OPERATOR_BRANCH must be set
+get-operator-crds: var-require-all-OPERATOR_BRANCH
 	cd ./charts/tigera-operator/crds/ && \
-	for file in operator.tigera.io_*.yaml; do echo "downloading $$file from operator repo" && curl -fsSL https://raw.githubusercontent.com/tigera/operator/${OPERATOR_BRANCH_NAME}/pkg/crds/operator/$${file%_crd.yaml}.yaml -o $${file}; done
-	cd ./manifests/ocp/ && \
-	for file in operator.tigera.io_*.yaml; do echo "downloading $$file from operator repo" && curl -fsSL https://raw.githubusercontent.com/tigera/operator/${OPERATOR_BRANCH_NAME}/pkg/crds/operator/$${file%_crd.yaml}.yaml -o $${file}; done
+	for file in operator.tigera.io_*.yaml; do echo "downloading $$file from operator repo" && curl -fsSL https://raw.githubusercontent.com/tigera/operator/$(OPERATOR_BRANCH)/pkg/crds/operator/$${file%_crd.yaml}.yaml -o $${file}; done
 
 gen-semaphore-yaml:
 	cd .semaphore && ./generate-semaphore-yaml.sh
@@ -150,14 +149,7 @@ helm-index:
 
 # Creates the tar file used for installing Calico on OpenShift.
 bin/ocp.tgz: manifests/ocp/ bin/yq
-	mkdir -p bin/tmp
-	cp -r manifests/ocp bin/tmp/
-	$(DOCKER_RUN) $(CALICO_BUILD) /bin/bash -c "                                        \
-		for file in bin/tmp/ocp/*crd* ;                                                 \
-        	do bin/yq -i 'del(.. | select(has(\"description\")).description)' \$$file ; \
-        done"
-	tar czvf $@ -C bin/tmp ocp
-	rm -rf bin/tmp
+	tar czvf $@ -C manifests/ ocp
 
 ## Generates release notes for the given version.
 .PHONY: release-notes

charts/tigera-operator/crds/operator.tigera.io_imagesets_crd.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: imagesets.operator.tigera.io
 spec:
   group: operator.tigera.io
@@ -16,45 +16,51 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: ImageSet is used to specify image digests for the images that
-          the operator deploys. The name of the ImageSet is expected to be in the
-          format `<variant>-<release>`. The `variant` used is `enterprise` if the
-          InstallationSpec Variant is `TigeraSecureEnterprise` otherwise it is `calico`.
-          The `release` must match the version of the variant that the operator is
-          built to deploy, this version can be obtained by passing the `--version`
-          flag to the operator binary.
+        description: |-
+          ImageSet is used to specify image digests for the images that the operator deploys.
+          The name of the ImageSet is expected to be in the format `<variant>-<release>`.
+          The `variant` used is `enterprise` if the InstallationSpec Variant is
+          `TigeraSecureEnterprise` otherwise it is `calico`.
+          The `release` must match the version of the variant that the operator is built to deploy,
+          this version can be obtained by passing the `--version` flag to the operator binary.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
           spec:
             description: ImageSetSpec defines the desired state of ImageSet.
             properties:
               images:
-                description: Images is the list of images to use digests. All images
-                  that the operator will deploy must be specified.
+                description: |-
+                  Images is the list of images to use digests. All images that the operator will deploy
+                  must be specified.
                 items:
                   properties:
                     digest:
-                      description: Digest is the image identifier that will be used
-                        for the Image. The field should not include a leading `@`
-                        and must be prefixed with `sha256:`.
+                      description: |-
+                        Digest is the image identifier that will be used for the Image.
+                        The field should not include a leading `@` and must be prefixed with `sha256:`.
                       type: string
                     image:
-                      description: Image is an image that the operator deploys and
-                        instead of using the built in tag the operator will use the
-                        Digest for the image identifier. The value should be the image
-                        name without registry or tag or digest. For the image `docker.io/calico/node:v3.17.1`
-                        it should be represented as `calico/node`
+                      description: |-
+                        Image is an image that the operator deploys and instead of using the built in tag
+                        the operator will use the Digest for the image identifier.
+                        The value should be the image name without registry or tag or digest.
+                        For the image `docker.io/calico/node:v3.17.1` it should be represented as `calico/node`
                       type: string
                   required:
                   - digest