From 41ab7380be060546a80bd6a52293bd6c47dac686 Mon Sep 17 00:00:00 2001 From: acmenezes Date: Wed, 5 Jun 2024 09:39:55 -0400 Subject: [PATCH] REMOVE extension remaining CRD --- .../olm.operatorframework.io_extensions.yaml | 225 ------------------ config/crd/kustomization.yaml | 1 - 2 files changed, 226 deletions(-) delete mode 100644 config/crd/bases/olm.operatorframework.io_extensions.yaml diff --git a/config/crd/bases/olm.operatorframework.io_extensions.yaml b/config/crd/bases/olm.operatorframework.io_extensions.yaml deleted file mode 100644 index ac2c6a75c..000000000 --- a/config/crd/bases/olm.operatorframework.io_extensions.yaml +++ /dev/null @@ -1,225 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.14.0 - name: extensions.olm.operatorframework.io -spec: - group: olm.operatorframework.io - names: - kind: Extension - listKind: ExtensionList - plural: extensions - singular: extension - scope: Namespaced - versions: - - additionalPrinterColumns: - - description: The current reconciliation state of this extension - jsonPath: .status.paused - name: Paused - type: string - name: v1alpha1 - schema: - openAPIV3Schema: - description: Extension is the Schema for the extensions 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 - 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 - type: string - metadata: - type: object - spec: - description: ExtensionSpec defines the desired state of Extension - properties: - paused: - description: paused controls the management state of the extension. - If the extension is paused, it will be ignored by the extension - controller. - type: boolean - serviceAccountName: - description: serviceAccountName is the name of a service account in - the Extension's namespace that will be used to manage the installation - and lifecycle of the extension. - maxLength: 253 - pattern: ^[a-z0-9]+([\.-][a-z0-9]+)*$ - type: string - skipCRDUpgradeSafetyCheck: - description: skipCRDUpgradeSafetyCheck specifies whether or not the - CRD upgrade safety checks should be skipped when attempting to install - the extension - type: boolean - source: - description: source of Extension to be installed - properties: - package: - description: package defines a reference for a bundle in a catalog - defined by a name and a version and/or channel - properties: - channel: - description: channel constraint definition - maxLength: 48 - pattern: ^[a-z0-9]+([\.-][a-z0-9]+)*$ - type: string - name: - description: name specifies the name of the name of the package - maxLength: 48 - pattern: ^[a-z0-9]+(-[a-z0-9]+)*$ - type: string - upgradeConstraintPolicy: - default: Enforce - description: upgradeConstraintPolicy Defines the policy for - how to handle upgrade constraints - enum: - - Enforce - - Ignore - type: string - version: - description: |- - Version is an optional semver constraint on the package version. If not specified, the latest version available of the package will be installed. - If specified, the specific version of the package will be installed so long as it is available in any of the content sources available. - Examples: 1.2.3, 1.0.0-alpha, 1.0.0-rc.1 - - - For more information on semver, please see https://semver.org/ - version constraint definition - maxLength: 64 - pattern: ^(\s*(=||!=|>|<|>=|=>|<=|=<|~|~>|\^)\s*(v?(0|[1-9]\d*|[x|X|\*])(\.(0|[1-9]\d*|x|X|\*]))?(\.(0|[1-9]\d*|x|X|\*))?(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?)\s*)((?:\s+|,\s*|\s*\|\|\s*)(=||!=|>|<|>=|=>|<=|=<|~|~>|\^)\s*(v?(0|[1-9]\d*|x|X|\*])(\.(0|[1-9]\d*|x|X|\*))?(\.(0|[1-9]\d*|x|X|\*]))?(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?)\s*)*$ - type: string - required: - - name - type: object - sourceType: - description: sourceType is the discriminator for the source type - enum: - - package - type: string - required: - - sourceType - type: object - x-kubernetes-validations: - - message: sourceType must match populated union field - rule: self.sourceType=='package' && has(self.__package__) - required: - - serviceAccountName - - source - type: object - status: - description: ExtensionStatus defines the observed state of Extension - properties: - conditions: - items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - installedBundle: - properties: - name: - type: string - version: - type: string - required: - - name - - version - type: object - paused: - description: paused indicates the current reconciliation state of - this extension - type: boolean - resolvedBundle: - properties: - name: - type: string - version: - type: string - required: - - name - - version - type: object - required: - - paused - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 2e88d28bc..ec864639d 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -3,7 +3,6 @@ # It should be run by config/default resources: - bases/olm.operatorframework.io_clusterextensions.yaml -- bases/olm.operatorframework.io_extensions.yaml # the following config is for teaching kustomize how to do kustomization for CRDs. configurations: