From 5542026a3d41295ac1ef9fb64557d5469caaac58 Mon Sep 17 00:00:00 2001 From: Anik Bhattacharjee Date: Tue, 20 May 2025 13:13:19 -0400 Subject: [PATCH] OCPBUGS-44462: Remove PlatformOperators from feature list Platform operator was removed from Openshift in 4.16. See * Jira epic [Remove PlatformOperators from OCP](https://issues.redhat.com/browse/OPRUN-3336) * [PR](https://github.com/openshift/platform-operators/pull/113) that removed `PlatformOperators` from OCP payload. This PR removes `PlatformOperators` from the list of features available as TechPreview in OCP. --- features.md | 1 - features/features.go | 8 - features/legacyfeaturegates.go | 2 - .../generated_openapi/zz_generated.openapi.go | 216 ------------------ openapi/openapi.json | 124 ---------- payload-command/render/legacyfeaturegates.go | 2 - .../featureGate-Hypershift-Default.yaml | 3 - ...reGate-Hypershift-DevPreviewNoUpgrade.yaml | 3 - ...eGate-Hypershift-TechPreviewNoUpgrade.yaml | 3 - .../featureGate-SelfManagedHA-Default.yaml | 3 - ...ate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 3 - ...te-SelfManagedHA-TechPreviewNoUpgrade.yaml | 3 - platform/.codegen.yaml | 2 - platform/install.go | 49 ++-- platform/v1alpha1/Makefile | 3 - platform/v1alpha1/doc.go | 7 + platform/v1alpha1/register.go | 49 ++-- .../PlatformOperators.yaml | 20 -- platform/v1alpha1/types.go | 171 +++++++------- .../zz_generated.crd-manifests/doc.go | 1 - ...platformoperators-CustomNoUpgrade.crd.yaml | 155 ------------- ...formoperators-DevPreviewNoUpgrade.crd.yaml | 155 ------------- ...ormoperators-TechPreviewNoUpgrade.crd.yaml | 155 ------------- platform/v1alpha1/zz_generated.deepcopy.go | 145 ------------ ..._generated.featuregated-crd-manifests.yaml | 25 -- .../PlatformOperators.yaml | 154 ------------- .../zz_generated.swagger_doc_generated.go | 69 ------ 27 files changed, 152 insertions(+), 1379 deletions(-) delete mode 100644 platform/.codegen.yaml delete mode 100644 platform/v1alpha1/Makefile delete mode 100644 platform/v1alpha1/tests/platformoperators.platform.openshift.io/PlatformOperators.yaml delete mode 100644 platform/v1alpha1/zz_generated.crd-manifests/doc.go delete mode 100644 platform/v1alpha1/zz_generated.crd-manifests/platformoperators-CustomNoUpgrade.crd.yaml delete mode 100644 platform/v1alpha1/zz_generated.crd-manifests/platformoperators-DevPreviewNoUpgrade.crd.yaml delete mode 100644 platform/v1alpha1/zz_generated.crd-manifests/platformoperators-TechPreviewNoUpgrade.crd.yaml delete mode 100644 platform/v1alpha1/zz_generated.deepcopy.go delete mode 100644 platform/v1alpha1/zz_generated.featuregated-crd-manifests.yaml delete mode 100644 platform/v1alpha1/zz_generated.featuregated-crd-manifests/platformoperators.platform.openshift.io/PlatformOperators.yaml delete mode 100644 platform/v1alpha1/zz_generated.swagger_doc_generated.go diff --git a/features.md b/features.md index a53ec7e0a56..ed38c2a045e 100644 --- a/features.md +++ b/features.md @@ -49,7 +49,6 @@ | NutanixMultiSubnets| | | Enabled | Enabled | Enabled | Enabled | | OVNObservability| | | Enabled | Enabled | Enabled | Enabled | | PinnedImages| | | Enabled | Enabled | Enabled | Enabled | -| PlatformOperators| | | Enabled | Enabled | Enabled | Enabled | | PreconfiguredUDNAddresses| | | Enabled | Enabled | Enabled | Enabled | | RouteAdvertisements| | | Enabled | Enabled | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index fe6dee8487e..312257394bf 100644 --- a/features/features.go +++ b/features/features.go @@ -491,14 +491,6 @@ var ( enableIn(configv1.DevPreviewNoUpgrade). mustRegister() - FeatureGatePlatformOperators = newFeatureGate("PlatformOperators"). - reportProblemsToJiraComponent("olm"). - contactPerson("joe"). - productScope(ocpSpecific). - enhancementPR(legacyFeatureGateWithoutEnhancement). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). - mustRegister() - FeatureGateNewOLM = newFeatureGate("NewOLM"). reportProblemsToJiraComponent("olm"). contactPerson("joe"). diff --git a/features/legacyfeaturegates.go b/features/legacyfeaturegates.go index 2a74f8e8b84..c79e3817e02 100644 --- a/features/legacyfeaturegates.go +++ b/features/legacyfeaturegates.go @@ -101,8 +101,6 @@ var legacyFeatureGates = sets.New( // never add to this list, if you think you have an exception ask @deads2k "PinnedImages", // never add to this list, if you think you have an exception ask @deads2k - "PlatformOperators", - // never add to this list, if you think you have an exception ask @deads2k "PrivateHostedZoneAWS", // never add to this list, if you think you have an exception ask @deads2k "RouteAdvertisements", diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 105441990ce..80b0a06ff0c 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -1195,12 +1195,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/openshift/api/osin/v1.SessionSecret": schema_openshift_api_osin_v1_SessionSecret(ref), "github.com/openshift/api/osin/v1.SessionSecrets": schema_openshift_api_osin_v1_SessionSecrets(ref), "github.com/openshift/api/osin/v1.TokenConfig": schema_openshift_api_osin_v1_TokenConfig(ref), - "github.com/openshift/api/platform/v1alpha1.ActiveBundleDeployment": schema_openshift_api_platform_v1alpha1_ActiveBundleDeployment(ref), - "github.com/openshift/api/platform/v1alpha1.Package": schema_openshift_api_platform_v1alpha1_Package(ref), - "github.com/openshift/api/platform/v1alpha1.PlatformOperator": schema_openshift_api_platform_v1alpha1_PlatformOperator(ref), - "github.com/openshift/api/platform/v1alpha1.PlatformOperatorList": schema_openshift_api_platform_v1alpha1_PlatformOperatorList(ref), - "github.com/openshift/api/platform/v1alpha1.PlatformOperatorSpec": schema_openshift_api_platform_v1alpha1_PlatformOperatorSpec(ref), - "github.com/openshift/api/platform/v1alpha1.PlatformOperatorStatus": schema_openshift_api_platform_v1alpha1_PlatformOperatorStatus(ref), "github.com/openshift/api/project/v1.Project": schema_openshift_api_project_v1_Project(ref), "github.com/openshift/api/project/v1.ProjectList": schema_openshift_api_project_v1_ProjectList(ref), "github.com/openshift/api/project/v1.ProjectRequest": schema_openshift_api_project_v1_ProjectRequest(ref), @@ -61247,216 +61241,6 @@ func schema_openshift_api_osin_v1_TokenConfig(ref common.ReferenceCallback) comm } } -func schema_openshift_api_platform_v1alpha1_ActiveBundleDeployment(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ActiveBundleDeployment references a BundleDeployment resource.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Description: "name is the metadata.name of the referenced BundleDeployment object.", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"name"}, - }, - }, - } -} - -func schema_openshift_api_platform_v1alpha1_Package(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Package contains fields to configure which OLM package this PlatformOperator will install", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Description: "name contains the desired OLM-based Operator package name that is defined in an existing CatalogSource resource in the cluster.\n\nThis configured package will be managed with the cluster's lifecycle. In the current implementation, it will be retrieving this name from a list of supported operators out of the catalogs included with OpenShift.", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"name"}, - }, - }, - } -} - -func schema_openshift_api_platform_v1alpha1_PlatformOperator(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "PlatformOperator is the Schema for the PlatformOperators API.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Description: "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/platform/v1alpha1.PlatformOperatorSpec"), - }, - }, - "status": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/platform/v1alpha1.PlatformOperatorStatus"), - }, - }, - }, - Required: []string{"spec"}, - }, - }, - Dependencies: []string{ - "github.com/openshift/api/platform/v1alpha1.PlatformOperatorSpec", "github.com/openshift/api/platform/v1alpha1.PlatformOperatorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_openshift_api_platform_v1alpha1_PlatformOperatorList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "PlatformOperatorList contains a list of PlatformOperators\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Description: "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/platform/v1alpha1.PlatformOperator"), - }, - }, - }, - }, - }, - }, - Required: []string{"items"}, - }, - }, - Dependencies: []string{ - "github.com/openshift/api/platform/v1alpha1.PlatformOperator", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, - } -} - -func schema_openshift_api_platform_v1alpha1_PlatformOperatorSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "PlatformOperatorSpec defines the desired state of PlatformOperator.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "package": { - SchemaProps: spec.SchemaProps{ - Description: "package contains the desired package and its configuration for this PlatformOperator.", - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/platform/v1alpha1.Package"), - }, - }, - }, - Required: []string{"package"}, - }, - }, - Dependencies: []string{ - "github.com/openshift/api/platform/v1alpha1.Package"}, - } -} - -func schema_openshift_api_platform_v1alpha1_PlatformOperatorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "PlatformOperatorStatus defines the observed state of PlatformOperator", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "conditions": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-map-keys": []interface{}{ - "type", - }, - "x-kubernetes-list-type": "map", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "conditions represent the latest available observations of a platform operator's current state.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Condition"), - }, - }, - }, - }, - }, - "activeBundleDeployment": { - SchemaProps: spec.SchemaProps{ - Description: "activeBundleDeployment is the reference to the BundleDeployment resource that's being managed by this PO resource. If this field is not populated in the status then it means the PlatformOperator has either not been installed yet or is failing to install.", - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/platform/v1alpha1.ActiveBundleDeployment"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/openshift/api/platform/v1alpha1.ActiveBundleDeployment", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, - } -} - func schema_openshift_api_project_v1_Project(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/openapi/openapi.json b/openapi/openapi.json index b5e02bdb2cf..5a06896d85f 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -35890,130 +35890,6 @@ } } }, - "com.github.openshift.api.platform.v1alpha1.ActiveBundleDeployment": { - "description": "ActiveBundleDeployment references a BundleDeployment resource.", - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name is the metadata.name of the referenced BundleDeployment object.", - "type": "string", - "default": "" - } - } - }, - "com.github.openshift.api.platform.v1alpha1.Package": { - "description": "Package contains fields to configure which OLM package this PlatformOperator will install", - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name contains the desired OLM-based Operator package name that is defined in an existing CatalogSource resource in the cluster.\n\nThis configured package will be managed with the cluster's lifecycle. In the current implementation, it will be retrieving this name from a list of supported operators out of the catalogs included with OpenShift.", - "type": "string", - "default": "" - } - } - }, - "com.github.openshift.api.platform.v1alpha1.PlatformOperator": { - "description": "PlatformOperator is the Schema for the PlatformOperators API.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "spec" - ], - "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": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.platform.v1alpha1.PlatformOperatorSpec" - }, - "status": { - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.platform.v1alpha1.PlatformOperatorStatus" - } - } - }, - "com.github.openshift.api.platform.v1alpha1.PlatformOperatorList": { - "description": "PlatformOperatorList contains a list of PlatformOperators\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "items" - ], - "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" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.platform.v1alpha1.PlatformOperator" - } - }, - "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": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - } - }, - "com.github.openshift.api.platform.v1alpha1.PlatformOperatorSpec": { - "description": "PlatformOperatorSpec defines the desired state of PlatformOperator.", - "type": "object", - "required": [ - "package" - ], - "properties": { - "package": { - "description": "package contains the desired package and its configuration for this PlatformOperator.", - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.platform.v1alpha1.Package" - } - } - }, - "com.github.openshift.api.platform.v1alpha1.PlatformOperatorStatus": { - "description": "PlatformOperatorStatus defines the observed state of PlatformOperator", - "type": "object", - "properties": { - "activeBundleDeployment": { - "description": "activeBundleDeployment is the reference to the BundleDeployment resource that's being managed by this PO resource. If this field is not populated in the status then it means the PlatformOperator has either not been installed yet or is failing to install.", - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.platform.v1alpha1.ActiveBundleDeployment" - }, - "conditions": { - "description": "conditions represent the latest available observations of a platform operator's current state.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - } - } - }, "com.github.openshift.api.project.v1.Project": { "description": "Projects are the unit of isolation and collaboration in OpenShift. A project has one or more members, a quota on the resources that the project may consume, and the security controls on the resources in the project. Within a project, members may have different roles - project administrators can set membership, editors can create and manage the resources, and viewers can see but not access running containers. In a normal cluster project administrators are not able to alter their quotas - that is restricted to cluster administrators.\n\nListing or watching projects will return only projects the user has the reader role on.\n\nAn OpenShift project is an alternative representation of a Kubernetes namespace. Projects are exposed as editable to end users while namespaces are not. Direct creation of a project is typically restricted to administrators, while end users should use the requestproject resource.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", diff --git a/payload-command/render/legacyfeaturegates.go b/payload-command/render/legacyfeaturegates.go index 48101fe3dbb..55e63969061 100644 --- a/payload-command/render/legacyfeaturegates.go +++ b/payload-command/render/legacyfeaturegates.go @@ -103,8 +103,6 @@ var legacyFeatureGates = sets.New( // never add to this list, if you think you have an exception ask @deads2k "PinnedImages", // never add to this list, if you think you have an exception ask @deads2k - "PlatformOperators", - // never add to this list, if you think you have an exception ask @deads2k "PrivateHostedZoneAWS", // never add to this list, if you think you have an exception ask @deads2k "RouteAdvertisements", diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index 06cc18dadbb..39508d952b5 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -151,9 +151,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index ee14dd518b9..575eb663c25 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -236,9 +236,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index b5695fb04d4..405faf246a9 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -242,9 +242,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index a61c8695fb9..cdef57cc23b 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -151,9 +151,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 807610bfe58..40c45f7016e 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -236,9 +236,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index 1371ac10bee..d81b50add63 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -242,9 +242,6 @@ { "name": "PinnedImages" }, - { - "name": "PlatformOperators" - }, { "name": "PreconfiguredUDNAddresses" }, diff --git a/platform/.codegen.yaml b/platform/.codegen.yaml deleted file mode 100644 index ffa2c8d9b2e..00000000000 --- a/platform/.codegen.yaml +++ /dev/null @@ -1,2 +0,0 @@ -swaggerdocs: - commentPolicy: Warn diff --git a/platform/install.go b/platform/install.go index 624a5e0c4e2..59c2ab1020b 100644 --- a/platform/install.go +++ b/platform/install.go @@ -1,28 +1,35 @@ package platform -import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" +// PlatformOperator was removed from the OpenShift API in 4.16. +// See +// * https://issues.redhat.com/browse/OPRUN-3336 +// * https://github.com/openshift/platform-operators/pull/113 +// This API specficiation is kept here for historical reference only. +// It is not used in the codebase and will not be used to generate code by code-gen. - platformv1alpha1 "github.com/openshift/api/platform/v1alpha1" -) +// import ( +// "k8s.io/apimachinery/pkg/runtime" +// "k8s.io/apimachinery/pkg/runtime/schema" -const ( - GroupName = "platform.openshift.io" -) +// platformv1alpha1 "github.com/openshift/api/platform/v1alpha1" +// ) -var ( - schemeBuilder = runtime.NewSchemeBuilder( - platformv1alpha1.Install, - ) - // Install is a function which adds every version of this group to a scheme - Install = schemeBuilder.AddToScheme -) +// const ( +// GroupName = "platform.openshift.io" +// ) -func Resource(resource string) schema.GroupResource { - return schema.GroupResource{Group: GroupName, Resource: resource} -} +// var ( +// schemeBuilder = runtime.NewSchemeBuilder( +// platformv1alpha1.Install, +// ) +// // Install is a function which adds every version of this group to a scheme +// Install = schemeBuilder.AddToScheme +// ) -func Kind(kind string) schema.GroupKind { - return schema.GroupKind{Group: GroupName, Kind: kind} -} +// func Resource(resource string) schema.GroupResource { +// return schema.GroupResource{Group: GroupName, Resource: resource} +// } + +// func Kind(kind string) schema.GroupKind { +// return schema.GroupKind{Group: GroupName, Kind: kind} +// } diff --git a/platform/v1alpha1/Makefile b/platform/v1alpha1/Makefile deleted file mode 100644 index 881480268cf..00000000000 --- a/platform/v1alpha1/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -.PHONY: test -test: - make -C ../../tests test GINKGO_EXTRA_ARGS=--focus="platform.openshift.io/v1alpha1" diff --git a/platform/v1alpha1/doc.go b/platform/v1alpha1/doc.go index 46e077f490f..fe89e929b66 100644 --- a/platform/v1alpha1/doc.go +++ b/platform/v1alpha1/doc.go @@ -5,3 +5,10 @@ // +groupName=platform.openshift.io // Package v1alpha1 is the v1alpha1 version of the API. package v1alpha1 + +// PlatformOperator was removed from the OpenShift API in 4.16. +// See +// * https://issues.redhat.com/browse/OPRUN-3336 +// * https://github.com/openshift/platform-operators/pull/113 +// This API specficiation is kept here for historical reference only. +// It is not used in the codebase and will not be used to generate code by code-gen. diff --git a/platform/v1alpha1/register.go b/platform/v1alpha1/register.go index 17abfd7229c..97a09657555 100644 --- a/platform/v1alpha1/register.go +++ b/platform/v1alpha1/register.go @@ -1,25 +1,32 @@ package v1alpha1 -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) +// PlatformOperator was removed from the OpenShift API in 4.16. +// See +// * https://issues.redhat.com/browse/OPRUN-3336 +// * https://github.com/openshift/platform-operators/pull/113 +// This API specficiation is kept here for historical reference only. +// It is not used in the codebase and will not be used to generate code by code-gen. -var ( - GroupName = "platform.openshift.io" - GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} - schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - // Install is a function which adds this version to a scheme - Install = schemeBuilder.AddToScheme -) +// import ( +// metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +// "k8s.io/apimachinery/pkg/runtime" +// "k8s.io/apimachinery/pkg/runtime/schema" +// ) -// Adds the list of known types to api.Scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(GroupVersion, - &PlatformOperator{}, - &PlatformOperatorList{}, - ) - metav1.AddToGroupVersion(scheme, GroupVersion) - return nil -} +// var ( +// GroupName = "platform.openshift.io" +// GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +// schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) +// // Install is a function which adds this version to a scheme +// Install = schemeBuilder.AddToScheme +// ) + +// // Adds the list of known types to api.Scheme. +// func addKnownTypes(scheme *runtime.Scheme) error { +// scheme.AddKnownTypes(GroupVersion, +// &PlatformOperator{}, +// &PlatformOperatorList{}, +// ) +// metav1.AddToGroupVersion(scheme, GroupVersion) +// return nil +// } diff --git a/platform/v1alpha1/tests/platformoperators.platform.openshift.io/PlatformOperators.yaml b/platform/v1alpha1/tests/platformoperators.platform.openshift.io/PlatformOperators.yaml deleted file mode 100644 index f24b6dab8ac..00000000000 --- a/platform/v1alpha1/tests/platformoperators.platform.openshift.io/PlatformOperators.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this -name: "PlatformOperator" -crdName: platformoperators.platform.openshift.io -featureGates: -- PlatformOperators -tests: - onCreate: - - name: Should be able to create a minimal PlatformOperator - initial: | - apiVersion: platform.openshift.io/v1alpha1 - kind: PlatformOperator - spec: - package: - name: foo - expected: | - apiVersion: platform.openshift.io/v1alpha1 - kind: PlatformOperator - spec: - package: - name: foo diff --git a/platform/v1alpha1/types.go b/platform/v1alpha1/types.go index 7ad9edcfc4d..4d3a0dfeb60 100644 --- a/platform/v1alpha1/types.go +++ b/platform/v1alpha1/types.go @@ -1,97 +1,104 @@ package v1alpha1 -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) +// PlatformOperator was removed from the OpenShift API in 4.16. +// See +// * https://issues.redhat.com/browse/OPRUN-3336 +// * https://github.com/openshift/platform-operators/pull/113 +// This API specficiation is kept here for historical reference only. +// It is not used in the codebase and will not be used to generate code by code-gen. -// Package contains fields to configure which OLM package this PlatformOperator will install -type Package struct { - // name contains the desired OLM-based Operator package name - // that is defined in an existing CatalogSource resource in the cluster. - // - // This configured package will be managed with the cluster's lifecycle. In - // the current implementation, it will be retrieving this name from a list of - // supported operators out of the catalogs included with OpenShift. - // +required - // - // +kubebuilder:validation:Pattern:=[a-z0-9]([-a-z0-9]*[a-z0-9])? - // +kubebuilder:validation:MaxLength:=56 - // --- - // + More restrictions to package names supported is an intentional design - // + decision that, while limiting to user options, allows code built on these - // + API's to make more confident assumptions on data structure. - Name string `json:"name"` -} +// import ( +// metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +// ) -// PlatformOperatorSpec defines the desired state of PlatformOperator. -type PlatformOperatorSpec struct { - // package contains the desired package and its configuration for this - // PlatformOperator. - // +required - Package Package `json:"package"` -} +// // Package contains fields to configure which OLM package this PlatformOperator will install +// type Package struct { +// // name contains the desired OLM-based Operator package name +// // that is defined in an existing CatalogSource resource in the cluster. +// // +// // This configured package will be managed with the cluster's lifecycle. In +// // the current implementation, it will be retrieving this name from a list of +// // supported operators out of the catalogs included with OpenShift. +// // +required +// // +// // +kubebuilder:validation:Pattern:=[a-z0-9]([-a-z0-9]*[a-z0-9])? +// // +kubebuilder:validation:MaxLength:=56 +// // --- +// // + More restrictions to package names supported is an intentional design +// // + decision that, while limiting to user options, allows code built on these +// // + API's to make more confident assumptions on data structure. +// Name string `json:"name"` +// } -// ActiveBundleDeployment references a BundleDeployment resource. -type ActiveBundleDeployment struct { - // name is the metadata.name of the referenced BundleDeployment object. - // +required - Name string `json:"name"` -} +// // PlatformOperatorSpec defines the desired state of PlatformOperator. +// type PlatformOperatorSpec struct { +// // package contains the desired package and its configuration for this +// // PlatformOperator. +// // +required +// Package Package `json:"package"` +// } -// PlatformOperatorStatus defines the observed state of PlatformOperator -type PlatformOperatorStatus struct { - // conditions represent the latest available observations of a platform operator's current state. - // +optional - // +listType=map - // +listMapKey=type - Conditions []metav1.Condition `json:"conditions,omitempty"` +// // ActiveBundleDeployment references a BundleDeployment resource. +// type ActiveBundleDeployment struct { +// // name is the metadata.name of the referenced BundleDeployment object. +// // +required +// Name string `json:"name"` +// } - // activeBundleDeployment is the reference to the BundleDeployment resource that's - // being managed by this PO resource. If this field is not populated in the status - // then it means the PlatformOperator has either not been installed yet or is - // failing to install. - // +optional - ActiveBundleDeployment ActiveBundleDeployment `json:"activeBundleDeployment,omitempty"` -} +// // PlatformOperatorStatus defines the observed state of PlatformOperator +// type PlatformOperatorStatus struct { +// // conditions represent the latest available observations of a platform operator's current state. +// // +optional +// // +listType=map +// // +listMapKey=type +// Conditions []metav1.Condition `json:"conditions,omitempty"` -// +genclient -// +genclient:nonNamespaced -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:resource:path=platformoperators,scope=Cluster -// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1234 -// +openshift:enable:FeatureGate=PlatformOperators -// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true -// +kubebuilder:metadata:annotations="exclude.release.openshift.io/internal-openshift-hosted=true" +// // activeBundleDeployment is the reference to the BundleDeployment resource that's +// // being managed by this PO resource. If this field is not populated in the status +// // then it means the PlatformOperator has either not been installed yet or is +// // failing to install. +// // +optional +// ActiveBundleDeployment ActiveBundleDeployment `json:"activeBundleDeployment,omitempty"` +// } -// PlatformOperator is the Schema for the PlatformOperators API. -// -// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. -// +openshift:compatibility-gen:level=4 -type PlatformOperator struct { - metav1.TypeMeta `json:",inline"` +// // +genclient +// // +genclient:nonNamespaced +// //+kubebuilder:object:root=true +// //+kubebuilder:subresource:status +// // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// // +kubebuilder:resource:path=platformoperators,scope=Cluster +// // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1234 +// // +openshift:enable:FeatureGate=PlatformOperators +// // +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true +// // +kubebuilder:metadata:annotations="exclude.release.openshift.io/internal-openshift-hosted=true" - // metadata is the standard object's metadata. - // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata - metav1.ObjectMeta `json:"metadata,omitempty"` +// // PlatformOperator is the Schema for the PlatformOperators API. +// // +// // Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +// // +openshift:compatibility-gen:level=4 +// type PlatformOperator struct { +// metav1.TypeMeta `json:",inline"` - Spec PlatformOperatorSpec `json:"spec"` - Status PlatformOperatorStatus `json:"status,omitempty"` -} +// // metadata is the standard object's metadata. +// // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata +// metav1.ObjectMeta `json:"metadata,omitempty"` -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// Spec PlatformOperatorSpec `json:"spec"` +// Status PlatformOperatorStatus `json:"status,omitempty"` +// } -// PlatformOperatorList contains a list of PlatformOperators -// -// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. -// +openshift:compatibility-gen:level=4 -type PlatformOperatorList struct { - metav1.TypeMeta `json:",inline"` +// // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - // metadata is the standard list's metadata. - // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata - metav1.ListMeta `json:"metadata,omitempty"` +// // PlatformOperatorList contains a list of PlatformOperators +// // +// // Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +// // +openshift:compatibility-gen:level=4 +// type PlatformOperatorList struct { +// metav1.TypeMeta `json:",inline"` - Items []PlatformOperator `json:"items"` -} +// // metadata is the standard list's metadata. +// // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata +// metav1.ListMeta `json:"metadata,omitempty"` + +// Items []PlatformOperator `json:"items"` +// } diff --git a/platform/v1alpha1/zz_generated.crd-manifests/doc.go b/platform/v1alpha1/zz_generated.crd-manifests/doc.go deleted file mode 100644 index 34487075ea8..00000000000 --- a/platform/v1alpha1/zz_generated.crd-manifests/doc.go +++ /dev/null @@ -1 +0,0 @@ -package platform_v1alpha1_crdmanifests diff --git a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-CustomNoUpgrade.crd.yaml b/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-CustomNoUpgrade.crd.yaml deleted file mode 100644 index 085d79f002c..00000000000 --- a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-CustomNoUpgrade.crd.yaml +++ /dev/null @@ -1,155 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/1234 - api.openshift.io/merged-by-featuregates: "true" - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: CustomNoUpgrade - name: platformoperators.platform.openshift.io -spec: - group: platform.openshift.io - names: - kind: PlatformOperator - listKind: PlatformOperatorList - plural: platformoperators - singular: platformoperator - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - PlatformOperator is the Schema for the PlatformOperators API. - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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: PlatformOperatorSpec defines the desired state of PlatformOperator. - properties: - package: - description: |- - package contains the desired package and its configuration for this - PlatformOperator. - properties: - name: - description: | - name contains the desired OLM-based Operator package name - that is defined in an existing CatalogSource resource in the cluster. - - This configured package will be managed with the cluster's lifecycle. In - the current implementation, it will be retrieving this name from a list of - supported operators out of the catalogs included with OpenShift. - maxLength: 56 - pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' - type: string - required: - - name - type: object - required: - - package - type: object - status: - description: PlatformOperatorStatus defines the observed state of PlatformOperator - properties: - activeBundleDeployment: - description: |- - activeBundleDeployment is the reference to the BundleDeployment resource that's - being managed by this PO resource. If this field is not populated in the status - then it means the PlatformOperator has either not been installed yet or is - failing to install. - properties: - name: - description: name is the metadata.name of the referenced BundleDeployment - object. - type: string - required: - - name - type: object - conditions: - description: conditions represent the latest available observations - of a platform operator's current state. - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - 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. - 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 - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-DevPreviewNoUpgrade.crd.yaml b/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-DevPreviewNoUpgrade.crd.yaml deleted file mode 100644 index e36618a440a..00000000000 --- a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-DevPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,155 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/1234 - api.openshift.io/merged-by-featuregates: "true" - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade - name: platformoperators.platform.openshift.io -spec: - group: platform.openshift.io - names: - kind: PlatformOperator - listKind: PlatformOperatorList - plural: platformoperators - singular: platformoperator - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - PlatformOperator is the Schema for the PlatformOperators API. - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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: PlatformOperatorSpec defines the desired state of PlatformOperator. - properties: - package: - description: |- - package contains the desired package and its configuration for this - PlatformOperator. - properties: - name: - description: | - name contains the desired OLM-based Operator package name - that is defined in an existing CatalogSource resource in the cluster. - - This configured package will be managed with the cluster's lifecycle. In - the current implementation, it will be retrieving this name from a list of - supported operators out of the catalogs included with OpenShift. - maxLength: 56 - pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' - type: string - required: - - name - type: object - required: - - package - type: object - status: - description: PlatformOperatorStatus defines the observed state of PlatformOperator - properties: - activeBundleDeployment: - description: |- - activeBundleDeployment is the reference to the BundleDeployment resource that's - being managed by this PO resource. If this field is not populated in the status - then it means the PlatformOperator has either not been installed yet or is - failing to install. - properties: - name: - description: name is the metadata.name of the referenced BundleDeployment - object. - type: string - required: - - name - type: object - conditions: - description: conditions represent the latest available observations - of a platform operator's current state. - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - 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. - 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 - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-TechPreviewNoUpgrade.crd.yaml b/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-TechPreviewNoUpgrade.crd.yaml deleted file mode 100644 index bf7afe43de0..00000000000 --- a/platform/v1alpha1/zz_generated.crd-manifests/platformoperators-TechPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,155 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/1234 - api.openshift.io/merged-by-featuregates: "true" - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade - name: platformoperators.platform.openshift.io -spec: - group: platform.openshift.io - names: - kind: PlatformOperator - listKind: PlatformOperatorList - plural: platformoperators - singular: platformoperator - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - PlatformOperator is the Schema for the PlatformOperators API. - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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: PlatformOperatorSpec defines the desired state of PlatformOperator. - properties: - package: - description: |- - package contains the desired package and its configuration for this - PlatformOperator. - properties: - name: - description: | - name contains the desired OLM-based Operator package name - that is defined in an existing CatalogSource resource in the cluster. - - This configured package will be managed with the cluster's lifecycle. In - the current implementation, it will be retrieving this name from a list of - supported operators out of the catalogs included with OpenShift. - maxLength: 56 - pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' - type: string - required: - - name - type: object - required: - - package - type: object - status: - description: PlatformOperatorStatus defines the observed state of PlatformOperator - properties: - activeBundleDeployment: - description: |- - activeBundleDeployment is the reference to the BundleDeployment resource that's - being managed by this PO resource. If this field is not populated in the status - then it means the PlatformOperator has either not been installed yet or is - failing to install. - properties: - name: - description: name is the metadata.name of the referenced BundleDeployment - object. - type: string - required: - - name - type: object - conditions: - description: conditions represent the latest available observations - of a platform operator's current state. - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - 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. - 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 - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/platform/v1alpha1/zz_generated.deepcopy.go b/platform/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index e17c573370b..00000000000 --- a/platform/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,145 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -// Code generated by codegen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ActiveBundleDeployment) DeepCopyInto(out *ActiveBundleDeployment) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ActiveBundleDeployment. -func (in *ActiveBundleDeployment) DeepCopy() *ActiveBundleDeployment { - if in == nil { - return nil - } - out := new(ActiveBundleDeployment) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Package) DeepCopyInto(out *Package) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Package. -func (in *Package) DeepCopy() *Package { - if in == nil { - return nil - } - out := new(Package) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PlatformOperator) DeepCopyInto(out *PlatformOperator) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlatformOperator. -func (in *PlatformOperator) DeepCopy() *PlatformOperator { - if in == nil { - return nil - } - out := new(PlatformOperator) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PlatformOperator) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PlatformOperatorList) DeepCopyInto(out *PlatformOperatorList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PlatformOperator, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlatformOperatorList. -func (in *PlatformOperatorList) DeepCopy() *PlatformOperatorList { - if in == nil { - return nil - } - out := new(PlatformOperatorList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PlatformOperatorList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PlatformOperatorSpec) DeepCopyInto(out *PlatformOperatorSpec) { - *out = *in - out.Package = in.Package - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlatformOperatorSpec. -func (in *PlatformOperatorSpec) DeepCopy() *PlatformOperatorSpec { - if in == nil { - return nil - } - out := new(PlatformOperatorSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PlatformOperatorStatus) DeepCopyInto(out *PlatformOperatorStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - out.ActiveBundleDeployment = in.ActiveBundleDeployment - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlatformOperatorStatus. -func (in *PlatformOperatorStatus) DeepCopy() *PlatformOperatorStatus { - if in == nil { - return nil - } - out := new(PlatformOperatorStatus) - in.DeepCopyInto(out) - return out -} diff --git a/platform/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/platform/v1alpha1/zz_generated.featuregated-crd-manifests.yaml deleted file mode 100644 index 5cca1386e5b..00000000000 --- a/platform/v1alpha1/zz_generated.featuregated-crd-manifests.yaml +++ /dev/null @@ -1,25 +0,0 @@ -platformoperators.platform.openshift.io: - Annotations: - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" - ApprovedPRNumber: https://github.com/openshift/api/pull/1234 - CRDName: platformoperators.platform.openshift.io - Capability: "" - Category: "" - FeatureGates: - - PlatformOperators - FilenameOperatorName: "" - FilenameOperatorOrdering: "" - FilenameRunLevel: "" - GroupName: platform.openshift.io - HasStatus: true - KindName: PlatformOperator - Labels: {} - PluralName: platformoperators - PrinterColumns: [] - Scope: Cluster - ShortNames: null - TopLevelFeatureGates: - - PlatformOperators - Version: v1alpha1 - diff --git a/platform/v1alpha1/zz_generated.featuregated-crd-manifests/platformoperators.platform.openshift.io/PlatformOperators.yaml b/platform/v1alpha1/zz_generated.featuregated-crd-manifests/platformoperators.platform.openshift.io/PlatformOperators.yaml deleted file mode 100644 index 6d7439bd927..00000000000 --- a/platform/v1alpha1/zz_generated.featuregated-crd-manifests/platformoperators.platform.openshift.io/PlatformOperators.yaml +++ /dev/null @@ -1,154 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/1234 - exclude.release.openshift.io/internal-openshift-hosted: "true" - feature-gate.release.openshift.io/PlatformOperators: "true" - include.release.openshift.io/self-managed-high-availability: "true" - name: platformoperators.platform.openshift.io -spec: - group: platform.openshift.io - names: - kind: PlatformOperator - listKind: PlatformOperatorList - plural: platformoperators - singular: platformoperator - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - PlatformOperator is the Schema for the PlatformOperators API. - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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: PlatformOperatorSpec defines the desired state of PlatformOperator. - properties: - package: - description: |- - package contains the desired package and its configuration for this - PlatformOperator. - properties: - name: - description: | - name contains the desired OLM-based Operator package name - that is defined in an existing CatalogSource resource in the cluster. - - This configured package will be managed with the cluster's lifecycle. In - the current implementation, it will be retrieving this name from a list of - supported operators out of the catalogs included with OpenShift. - maxLength: 56 - pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' - type: string - required: - - name - type: object - required: - - package - type: object - status: - description: PlatformOperatorStatus defines the observed state of PlatformOperator - properties: - activeBundleDeployment: - description: |- - activeBundleDeployment is the reference to the BundleDeployment resource that's - being managed by this PO resource. If this field is not populated in the status - then it means the PlatformOperator has either not been installed yet or is - failing to install. - properties: - name: - description: name is the metadata.name of the referenced BundleDeployment - object. - type: string - required: - - name - type: object - conditions: - description: conditions represent the latest available observations - of a platform operator's current state. - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - 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. - 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 - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/platform/v1alpha1/zz_generated.swagger_doc_generated.go b/platform/v1alpha1/zz_generated.swagger_doc_generated.go deleted file mode 100644 index 5cad7743b0f..00000000000 --- a/platform/v1alpha1/zz_generated.swagger_doc_generated.go +++ /dev/null @@ -1,69 +0,0 @@ -package v1alpha1 - -// This file contains a collection of methods that can be used from go-restful to -// generate Swagger API documentation for its models. Please read this PR for more -// information on the implementation: https://github.com/emicklei/go-restful/pull/215 -// -// TODOs are ignored from the parser (e.g. TODO(andronat):... || TODO:...) if and only if -// they are on one line! For multiple line or blocks that you want to ignore use ---. -// Any context after a --- is ignored. -// -// Those methods can be generated by using hack/update-swagger-docs.sh - -// AUTO-GENERATED FUNCTIONS START HERE -var map_ActiveBundleDeployment = map[string]string{ - "": "ActiveBundleDeployment references a BundleDeployment resource.", - "name": "name is the metadata.name of the referenced BundleDeployment object.", -} - -func (ActiveBundleDeployment) SwaggerDoc() map[string]string { - return map_ActiveBundleDeployment -} - -var map_Package = map[string]string{ - "": "Package contains fields to configure which OLM package this PlatformOperator will install", - "name": "name contains the desired OLM-based Operator package name that is defined in an existing CatalogSource resource in the cluster.\n\nThis configured package will be managed with the cluster's lifecycle. In the current implementation, it will be retrieving this name from a list of supported operators out of the catalogs included with OpenShift.", -} - -func (Package) SwaggerDoc() map[string]string { - return map_Package -} - -var map_PlatformOperator = map[string]string{ - "": "PlatformOperator is the Schema for the PlatformOperators API.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", -} - -func (PlatformOperator) SwaggerDoc() map[string]string { - return map_PlatformOperator -} - -var map_PlatformOperatorList = map[string]string{ - "": "PlatformOperatorList contains a list of PlatformOperators\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", -} - -func (PlatformOperatorList) SwaggerDoc() map[string]string { - return map_PlatformOperatorList -} - -var map_PlatformOperatorSpec = map[string]string{ - "": "PlatformOperatorSpec defines the desired state of PlatformOperator.", - "package": "package contains the desired package and its configuration for this PlatformOperator.", -} - -func (PlatformOperatorSpec) SwaggerDoc() map[string]string { - return map_PlatformOperatorSpec -} - -var map_PlatformOperatorStatus = map[string]string{ - "": "PlatformOperatorStatus defines the observed state of PlatformOperator", - "conditions": "conditions represent the latest available observations of a platform operator's current state.", - "activeBundleDeployment": "activeBundleDeployment is the reference to the BundleDeployment resource that's being managed by this PO resource. If this field is not populated in the status then it means the PlatformOperator has either not been installed yet or is failing to install.", -} - -func (PlatformOperatorStatus) SwaggerDoc() map[string]string { - return map_PlatformOperatorStatus -} - -// AUTO-GENERATED FUNCTIONS END HERE