From fc38099287c79d476901a605cbca81eeee0fb5f6 Mon Sep 17 00:00:00 2001 From: Pradipta Banerjee Date: Fri, 4 Oct 2024 05:24:10 -0400 Subject: [PATCH] Update generated files Update bundle and manifest files to align with operator-sdk 1.36.1 Signed-off-by: Pradipta Banerjee --- bundle.Dockerfile | 4 +- ...onfiguration.openshift.io_kataconfigs.yaml | 80 +++++++++--------- ...ainers-operator.clusterserviceversion.yaml | 8 +- bundle/metadata/annotations.yaml | 4 +- ...onfiguration.openshift.io_kataconfigs.yaml | 81 ++++++++++--------- config/manager/kustomization.yaml | 2 +- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 1 - 8 files changed, 95 insertions(+), 86 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index d39df175..dc1d433b 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=sandboxed-containers-operator LABEL operators.operatorframework.io.bundle.channels.v1=stable LABEL operators.operatorframework.io.bundle.channel.default.v1=stable -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.1 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/manifests/kataconfiguration.openshift.io_kataconfigs.yaml b/bundle/manifests/kataconfiguration.openshift.io_kataconfigs.yaml index e68e6974..8a9c5a8d 100644 --- a/bundle/manifests/kataconfiguration.openshift.io_kataconfigs.yaml +++ b/bundle/manifests/kataconfiguration.openshift.io_kataconfigs.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: kataconfigs.kataconfiguration.openshift.io spec: @@ -37,14 +37,19 @@ spec: description: KataConfig is the Schema for the kataconfigs API 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 @@ -54,20 +59,20 @@ spec: properties: checkNodeEligibility: default: false - description: CheckNodeEligibility is used to detect the node(s) eligibility - to run Kata containers. This is currently done through the use of - the Node Feature Discovery Operator (NFD). For more information - on how the check works, please refer to the sandboxed containers - documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html-single/user_guide/index#about-node-eligibility-checks_about-osc + description: |- + CheckNodeEligibility is used to detect the node(s) eligibility to run Kata containers. + This is currently done through the use of the Node Feature Discovery Operator (NFD). + For more information on how the check works, please refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html-single/user_guide/index#about-node-eligibility-checks_about-osc type: boolean enablePeerPods: default: false - description: EnablePeerPods is used to transparently create pods on - a remote system. For more information on how this works, please - refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html/user_guide/deploying-public-cloud#deploying-public-cloud + description: |- + EnablePeerPods is used to transparently create pods on a remote system. + For more information on how this works, please refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html/user_guide/deploying-public-cloud#deploying-public-cloud type: boolean kataConfigPoolSelector: - description: KataConfigPoolSelector is used to filter the worker nodes + description: |- + KataConfigPoolSelector is used to filter the worker nodes if not specified, all worker nodes are selected nullable: true properties: @@ -75,24 +80,24 @@ spec: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that - contains values, a key, and an operator that relates the key - and values. + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to - a set of values. Valid operators are In, NotIn, Exists - and DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. If the - operator is In or NotIn, the values array must be non-empty. - If the operator is Exists or DoesNotExist, the values - array must be empty. This array is replaced during a strategic + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic merge patch. items: type: string @@ -105,11 +110,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. A single - {key,value} in the matchLabels map is equivalent to an element - of matchExpressions, whose key field is "key", the operator - is "In", and the values array contains only "value". The requirements - are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -165,14 +169,16 @@ spec: type: string type: array nodeCount: - description: Number of cluster nodes that have kata installed - on them including those queued for installation and currently - installing, though excluding nodes that have a kata installation - but are queued for uninstallation or currently uninstalling. + description: |- + Number of cluster nodes that have kata installed on them including + those queued for installation and currently installing, though + excluding nodes that have a kata installation but are queued for + uninstallation or currently uninstalling. type: integer readyNodeCount: - description: Number of cluster nodes that have kata installed - on them and are currently ready to run kata workloads. + description: |- + Number of cluster nodes that have kata installed on them and are + currently ready to run kata workloads. type: integer uninstalling: items: diff --git a/bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml b/bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml index aaea135b..1c974407 100644 --- a/bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml +++ b/bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml @@ -13,7 +13,7 @@ metadata: } ] capabilities: Seamless Upgrades - createdAt: "2024-10-03T15:51:22Z" + createdAt: "2024-10-04T09:21:08Z" features.operators.openshift.io/disconnected: "true" features.operators.openshift.io/fips-compliant: "false" features.operators.openshift.io/proxy-aware: "false" @@ -25,9 +25,9 @@ metadata: operatorframework.io/suggested-namespace: openshift-sandboxed-containers-operator operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' - operators.operatorframework.io/builder: operator-sdk-v1.28.0 + operators.operatorframework.io/builder: operator-sdk-v1.36.1 operators.operatorframework.io/internal-objects: '["peerpods.confidentialcontainers.org","peerpodconfigs.confidentialcontainers.org"]' - operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/openshift/sandboxed-containers-operator labels: operatorframework.io/arch.amd64: supported @@ -429,7 +429,7 @@ spec: - configMapRef: name: peer-pods-cm optional: true - image: quay.io/rhgkurz/openshift-sandboxed-containers-operator:v1.7.0 + image: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator:v1.7.0 imagePullPolicy: Always name: manager ports: diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 21a88257..da247801 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,9 +6,9 @@ annotations: operators.operatorframework.io.bundle.package.v1: sandboxed-containers-operator operators.operatorframework.io.bundle.channels.v1: stable operators.operatorframework.io.bundle.channel.default.v1: stable - operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.36.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml b/config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml index 195612b7..ab4e48c8 100644 --- a/config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml +++ b/config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: kataconfigs.kataconfiguration.openshift.io spec: group: kataconfiguration.openshift.io @@ -38,14 +37,19 @@ spec: description: KataConfig is the Schema for the kataconfigs API 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 @@ -55,20 +59,20 @@ spec: properties: checkNodeEligibility: default: false - description: CheckNodeEligibility is used to detect the node(s) eligibility - to run Kata containers. This is currently done through the use of - the Node Feature Discovery Operator (NFD). For more information - on how the check works, please refer to the sandboxed containers - documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html-single/user_guide/index#about-node-eligibility-checks_about-osc + description: |- + CheckNodeEligibility is used to detect the node(s) eligibility to run Kata containers. + This is currently done through the use of the Node Feature Discovery Operator (NFD). + For more information on how the check works, please refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html-single/user_guide/index#about-node-eligibility-checks_about-osc type: boolean enablePeerPods: default: false - description: EnablePeerPods is used to transparently create pods on - a remote system. For more information on how this works, please - refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html/user_guide/deploying-public-cloud#deploying-public-cloud + description: |- + EnablePeerPods is used to transparently create pods on a remote system. + For more information on how this works, please refer to the sandboxed containers documentation - https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.6/html/user_guide/deploying-public-cloud#deploying-public-cloud type: boolean kataConfigPoolSelector: - description: KataConfigPoolSelector is used to filter the worker nodes + description: |- + KataConfigPoolSelector is used to filter the worker nodes if not specified, all worker nodes are selected nullable: true properties: @@ -76,24 +80,24 @@ spec: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that - contains values, a key, and an operator that relates the key - and values. + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to - a set of values. Valid operators are In, NotIn, Exists - and DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. If the - operator is In or NotIn, the values array must be non-empty. - If the operator is Exists or DoesNotExist, the values - array must be empty. This array is replaced during a strategic + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic merge patch. items: type: string @@ -106,11 +110,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. A single - {key,value} in the matchLabels map is equivalent to an element - of matchExpressions, whose key field is "key", the operator - is "In", and the values array contains only "value". The requirements - are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -166,14 +169,16 @@ spec: type: string type: array nodeCount: - description: Number of cluster nodes that have kata installed - on them including those queued for installation and currently - installing, though excluding nodes that have a kata installation - but are queued for uninstallation or currently uninstalling. + description: |- + Number of cluster nodes that have kata installed on them including + those queued for installation and currently installing, though + excluding nodes that have a kata installation but are queued for + uninstallation or currently uninstalling. type: integer readyNodeCount: - description: Number of cluster nodes that have kata installed - on them and are currently ready to run kata workloads. + description: |- + Number of cluster nodes that have kata installed on them and are + currently ready to run kata workloads. type: integer uninstalling: items: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 72dab394..58298f61 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator - newTag: 1.7.0 + newTag: v1.7.0 diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 6d694519..e057def0 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 3815cf3d..74ffc61c 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: