diff --git a/go.mod b/go.mod
index 28d86b931..b78870fec 100644
--- a/go.mod
+++ b/go.mod
@@ -31,6 +31,8 @@ require (
sigs.k8s.io/controller-runtime v0.19.0
)
+replace github.com/openshift/api => github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28
+
require (
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
diff --git a/go.sum b/go.sum
index 0732d9c76..199f922bb 100644
--- a/go.sum
+++ b/go.sum
@@ -125,6 +125,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28 h1:O2U0aoxGAmXG+PvZobqv+D3+sue8dtwcEnL9t28k/F4=
+github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -168,8 +170,6 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
-github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf h1:tFgVKwcH24iKFSF2xERS/payZL1BB/UwEJWeb/OO0xo=
-github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72 h1:kMM+Ea3YFrcoYS76RhhBA7uELy97JM0gwqnyoy7fxco=
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20241107164952-923091dd2b1a h1:h3F55x+zOXwSG4okUlXmOlU/5CQ7Ve2HKxYjseJPVoY=
diff --git a/manifests/0000_51_olm_00-olm-operator.yml b/manifests/0000_51_olm_00-olm-operator.yml
index 342b014c4..6119d1046 100644
--- a/manifests/0000_51_olm_00-olm-operator.yml
+++ b/manifests/0000_51_olm_00-olm-operator.yml
@@ -3,11 +3,8 @@ kind: OLM
metadata:
name: cluster
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
release.openshift.io/create-only: "true"
spec:
managementState: Managed
diff --git a/manifests/0000_51_olm_01_operator_namespace.yaml b/manifests/0000_51_olm_01_operator_namespace.yaml
index 86e21fd86..f67f18b8b 100644
--- a/manifests/0000_51_olm_01_operator_namespace.yaml
+++ b/manifests/0000_51_olm_01_operator_namespace.yaml
@@ -3,11 +3,8 @@ kind: Namespace
metadata:
name: openshift-cluster-olm-operator
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
pod-security.kubernetes.io/enforce: restricted
pod-security.kubernetes.io/enforce-version: latest
workload.openshift.io/allowed: "management"
diff --git a/manifests/0000_51_olm_02_operator_clusterrole.yaml b/manifests/0000_51_olm_02_operator_clusterrole.yaml
index 88e9c8994..80deedd5c 100644
--- a/manifests/0000_51_olm_02_operator_clusterrole.yaml
+++ b/manifests/0000_51_olm_02_operator_clusterrole.yaml
@@ -5,11 +5,8 @@ kind: ClusterRole
metadata:
name: cluster-olm-operator
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
rules:
- apiGroups:
- config.openshift.io
diff --git a/manifests/0000_51_olm_03_service_account.yaml b/manifests/0000_51_olm_03_service_account.yaml
index 47ca1f89f..7a6b375f3 100644
--- a/manifests/0000_51_olm_03_service_account.yaml
+++ b/manifests/0000_51_olm_03_service_account.yaml
@@ -4,8 +4,5 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
diff --git a/manifests/0000_51_olm_04_metrics_service.yaml b/manifests/0000_51_olm_04_metrics_service.yaml
index eb121c7ea..329bd62f0 100644
--- a/manifests/0000_51_olm_04_metrics_service.yaml
+++ b/manifests/0000_51_olm_04_metrics_service.yaml
@@ -5,11 +5,8 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator-metrics
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
service.alpha.openshift.io/serving-cert-secret-name: cluster-olm-operator-serving-cert
spec:
ports:
diff --git a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml
index 1feaa5a04..5a26a6099 100644
--- a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml
+++ b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml
@@ -3,11 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-olm-operator-role
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
subjects:
- kind: ServiceAccount
name: cluster-olm-operator
diff --git a/manifests/0000_51_olm_06_deployment.yaml b/manifests/0000_51_olm_06_deployment.yaml
index 44b19cf37..c671e751c 100644
--- a/manifests/0000_51_olm_06_deployment.yaml
+++ b/manifests/0000_51_olm_06_deployment.yaml
@@ -4,11 +4,8 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
spec:
replicas: 1
selector:
diff --git a/manifests/0000_51_olm_07_cluster_operator.yaml b/manifests/0000_51_olm_07_cluster_operator.yaml
index 3e1f88319..01cc8be6e 100644
--- a/manifests/0000_51_olm_07_cluster_operator.yaml
+++ b/manifests/0000_51_olm_07_cluster_operator.yaml
@@ -3,11 +3,8 @@ kind: ClusterOperator
metadata:
name: olm
annotations:
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
spec: {}
status:
versions:
diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
index 24e0b2f09..2b392298e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
+++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
@@ -746,6 +746,16 @@ type Update struct {
// Release represents an OpenShift release image and associated metadata.
// +k8s:deepcopy-gen=true
type Release struct {
+ // architecture is an optional field that indicates the
+ // value of the cluster architecture. In this context cluster
+ // architecture means either a single architecture or a multi
+ // architecture.
+ // Valid values are 'Multi' and empty.
+ //
+ // +openshift:enable:FeatureGate=ImageStreamImportMode
+ // +optional
+ Architecture ClusterVersionArchitecture `json:"architecture,omitempty"`
+
// version is a semantic version identifying the update version. When this
// field is part of spec, version is optional if image is specified.
// +required
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
index abfea5eaf..fac3744b3 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -115,6 +115,7 @@ clusterversions.config.openshift.io:
Capability: ""
Category: ""
FeatureGates:
+ - ImageStreamImportMode
- SignatureStores
FilenameOperatorName: cluster-version-operator
FilenameOperatorOrdering: "01"
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
index 145a7e4c0..aee2ef515 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
@@ -772,11 +772,12 @@ func (PromQLClusterCondition) SwaggerDoc() map[string]string {
}
var map_Release = map[string]string{
- "": "Release represents an OpenShift release image and associated metadata.",
- "version": "version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.",
- "image": "image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.",
- "url": "url contains information about this release. This URL is set by the 'url' metadata property on a release or the metadata returned by the update API and should be displayed as a link in user interfaces. The URL field may not be set for test or nightly releases.",
- "channels": "channels is the set of Cincinnati channels to which the release currently belongs.",
+ "": "Release represents an OpenShift release image and associated metadata.",
+ "architecture": "architecture is an optional field that indicates the value of the cluster architecture. In this context cluster architecture means either a single architecture or a multi architecture. Valid values are 'Multi' and empty.",
+ "version": "version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.",
+ "image": "image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.",
+ "url": "url contains information about this release. This URL is set by the 'url' metadata property on a release or the metadata returned by the update API and should be displayed as a link in user interfaces. The URL field may not be set for test or nightly releases.",
+ "channels": "channels is the set of Cincinnati channels to which the release currently belongs.",
}
func (Release) SwaggerDoc() map[string]string {
diff --git a/vendor/github.com/openshift/api/features.md b/vendor/github.com/openshift/api/features.md
index e5769fbce..bfeee782c 100644
--- a/vendor/github.com/openshift/api/features.md
+++ b/vendor/github.com/openshift/api/features.md
@@ -7,6 +7,7 @@
| MachineAPIOperatorDisableMachineHealthCheckController| | | | | | |
| MultiArchInstallAzure| | | | | | |
| GatewayAPI| | | Enabled | Enabled | | |
+| NewOLM| | Enabled | | Enabled | | Enabled |
| AWSClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled |
| AdditionalRoutingCapabilities| | | Enabled | Enabled | Enabled | Enabled |
| AutomatedEtcdBackup| | | Enabled | Enabled | Enabled | Enabled |
@@ -32,7 +33,6 @@
| MinimumKubeletVersion| | | Enabled | Enabled | Enabled | Enabled |
| MixedCPUsAllocation| | | Enabled | Enabled | Enabled | Enabled |
| NetworkSegmentation| | | Enabled | Enabled | Enabled | Enabled |
-| NewOLM| | | Enabled | Enabled | Enabled | Enabled |
| NodeSwap| | | Enabled | Enabled | Enabled | Enabled |
| OVNObservability| | | Enabled | Enabled | Enabled | Enabled |
| OnClusterBuild| | | Enabled | Enabled | Enabled | Enabled |
diff --git a/vendor/github.com/openshift/api/operator/v1/types_olm.go b/vendor/github.com/openshift/api/operator/v1/types_olm.go
index f70bc698b..1ce349d35 100644
--- a/vendor/github.com/openshift/api/operator/v1/types_olm.go
+++ b/vendor/github.com/openshift/api/operator/v1/types_olm.go
@@ -13,6 +13,8 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=olms,scope=Cluster
// +kubebuilder:subresource:status
+// +kubebuilder:metadata:annotations=include.release.openshift.io/ibm-cloud-managed=false
+// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1504
// +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=operator-lifecycle-manager,operatorOrdering=01
// +openshift:enable:FeatureGate=NewOLM
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml
deleted file mode 100644
index 575a0a114..000000000
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml
+++ /dev/null
@@ -1,216 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- annotations:
- api-approved.openshift.io: https://github.com/openshift/api/pull/1504
- api.openshift.io/merged-by-featuregates: "true"
- capability.openshift.io/name: OperatorLifecycleManagerV1
- include.release.openshift.io/ibm-cloud-managed: "true"
- include.release.openshift.io/self-managed-high-availability: "true"
- release.openshift.io/feature-set: DevPreviewNoUpgrade
- name: olms.operator.openshift.io
-spec:
- group: operator.openshift.io
- names:
- kind: OLM
- listKind: OLMList
- plural: olms
- singular: olm
- scope: Cluster
- versions:
- - name: v1
- schema:
- openAPIV3Schema:
- description: |-
- OLM provides information to configure an operator to manage the OLM controllers
-
- Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
- 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: spec holds user settable values for configuration
- properties:
- logLevel:
- default: Normal
- description: |-
- logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a
- simple way to manage coarse grained logging choices that operators have to interpret for their operands.
-
- Valid values are: "Normal", "Debug", "Trace", "TraceAll".
- Defaults to "Normal".
- enum:
- - ""
- - Normal
- - Debug
- - Trace
- - TraceAll
- type: string
- managementState:
- description: managementState indicates whether and how the operator
- should manage the component
- pattern: ^(Managed|Unmanaged|Force|Removed)$
- type: string
- observedConfig:
- description: |-
- observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because
- it is an input to the level for the operator
- nullable: true
- type: object
- x-kubernetes-preserve-unknown-fields: true
- operatorLogLevel:
- default: Normal
- description: |-
- operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
- simple way to manage coarse grained logging choices that operators have to interpret for themselves.
-
- Valid values are: "Normal", "Debug", "Trace", "TraceAll".
- Defaults to "Normal".
- enum:
- - ""
- - Normal
- - Debug
- - Trace
- - TraceAll
- type: string
- unsupportedConfigOverrides:
- description: |-
- unsupportedConfigOverrides overrides the final configuration that was computed by the operator.
- Red Hat does not support the use of this field.
- Misuse of this field could lead to unexpected behavior or conflict with other configuration options.
- Seek guidance from the Red Hat support before using this field.
- Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.
- nullable: true
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: object
- status:
- description: status holds observed values from the cluster. They may not
- be overridden.
- properties:
- conditions:
- description: conditions is a list of conditions and their status
- items:
- description: OperatorCondition is just the standard condition fields.
- 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:
- type: string
- reason:
- 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
- - status
- - type
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - type
- x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- required:
- - group
- - name
- - namespace
- - resource
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - group
- - resource
- - namespace
- - name
- x-kubernetes-list-type: map
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- x-kubernetes-validations:
- - message: must only increase
- rule: self >= oldSelf
- observedGeneration:
- description: observedGeneration is the last generation change you've
- dealt with
- format: int64
- type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
- type: object
- required:
- - spec
- type: object
- x-kubernetes-validations:
- - message: olm is a singleton, .metadata.name must be 'cluster'
- rule: self.metadata.name == 'cluster'
- served: true
- storage: true
- subresources:
- status: {}
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml
deleted file mode 100644
index cb522290e..000000000
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml
+++ /dev/null
@@ -1,216 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- annotations:
- api-approved.openshift.io: https://github.com/openshift/api/pull/1504
- api.openshift.io/merged-by-featuregates: "true"
- capability.openshift.io/name: OperatorLifecycleManagerV1
- include.release.openshift.io/ibm-cloud-managed: "true"
- include.release.openshift.io/self-managed-high-availability: "true"
- release.openshift.io/feature-set: TechPreviewNoUpgrade
- name: olms.operator.openshift.io
-spec:
- group: operator.openshift.io
- names:
- kind: OLM
- listKind: OLMList
- plural: olms
- singular: olm
- scope: Cluster
- versions:
- - name: v1
- schema:
- openAPIV3Schema:
- description: |-
- OLM provides information to configure an operator to manage the OLM controllers
-
- Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
- 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: spec holds user settable values for configuration
- properties:
- logLevel:
- default: Normal
- description: |-
- logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a
- simple way to manage coarse grained logging choices that operators have to interpret for their operands.
-
- Valid values are: "Normal", "Debug", "Trace", "TraceAll".
- Defaults to "Normal".
- enum:
- - ""
- - Normal
- - Debug
- - Trace
- - TraceAll
- type: string
- managementState:
- description: managementState indicates whether and how the operator
- should manage the component
- pattern: ^(Managed|Unmanaged|Force|Removed)$
- type: string
- observedConfig:
- description: |-
- observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because
- it is an input to the level for the operator
- nullable: true
- type: object
- x-kubernetes-preserve-unknown-fields: true
- operatorLogLevel:
- default: Normal
- description: |-
- operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
- simple way to manage coarse grained logging choices that operators have to interpret for themselves.
-
- Valid values are: "Normal", "Debug", "Trace", "TraceAll".
- Defaults to "Normal".
- enum:
- - ""
- - Normal
- - Debug
- - Trace
- - TraceAll
- type: string
- unsupportedConfigOverrides:
- description: |-
- unsupportedConfigOverrides overrides the final configuration that was computed by the operator.
- Red Hat does not support the use of this field.
- Misuse of this field could lead to unexpected behavior or conflict with other configuration options.
- Seek guidance from the Red Hat support before using this field.
- Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.
- nullable: true
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: object
- status:
- description: status holds observed values from the cluster. They may not
- be overridden.
- properties:
- conditions:
- description: conditions is a list of conditions and their status
- items:
- description: OperatorCondition is just the standard condition fields.
- 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:
- type: string
- reason:
- 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
- - status
- - type
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - type
- x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- required:
- - group
- - name
- - namespace
- - resource
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - group
- - resource
- - namespace
- - name
- x-kubernetes-list-type: map
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- x-kubernetes-validations:
- - message: must only increase
- rule: self >= oldSelf
- observedGeneration:
- description: observedGeneration is the last generation change you've
- dealt with
- format: int64
- type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
- type: object
- required:
- - spec
- type: object
- x-kubernetes-validations:
- - message: olm is a singleton, .metadata.name must be 'cluster'
- rule: self.metadata.name == 'cluster'
- served: true
- storage: true
- subresources:
- status: {}
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms.crd.yaml
similarity index 98%
rename from vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml
rename to vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms.crd.yaml
index 1b6b36024..ec9324856 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms.crd.yaml
@@ -5,9 +5,7 @@ metadata:
api-approved.openshift.io: https://github.com/openshift/api/pull/1504
api.openshift.io/merged-by-featuregates: "true"
capability.openshift.io/name: OperatorLifecycleManagerV1
- include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- release.openshift.io/feature-set: CustomNoUpgrade
name: olms.operator.openshift.io
spec:
group: operator.openshift.io
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
index 4feeafff9..7ab668f2d 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -347,7 +347,9 @@ networks.operator.openshift.io:
Version: v1
olms.operator.openshift.io:
- Annotations: {}
+ Annotations:
+ include.release.openshift.io/ibm-cloud-managed: "false"
+ include.release.openshift.io/self-managed-high-availability: "true"
ApprovedPRNumber: https://github.com/openshift/api/pull/1504
CRDName: olms.operator.openshift.io
Capability: OperatorLifecycleManagerV1
diff --git a/vendor/github.com/openshift/api/operator/v1alpha1/types_olm.go b/vendor/github.com/openshift/api/operator/v1alpha1/types_olm.go
index f29385b9f..748834ca9 100644
--- a/vendor/github.com/openshift/api/operator/v1alpha1/types_olm.go
+++ b/vendor/github.com/openshift/api/operator/v1alpha1/types_olm.go
@@ -17,6 +17,8 @@ import (
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=olms,scope=Cluster
// +kubebuilder:subresource:status
+// +kubebuilder:metadata:annotations=include.release.openshift.io/ibm-cloud-managed=false
+// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1504
// +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=operator-lifecycle-manager,operatorOrdering=01
// +openshift:enable:FeatureGate=NewOLM
diff --git a/vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
index 30c058236..53d8ff23c 100644
--- a/vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
@@ -44,7 +44,9 @@ imagecontentsourcepolicies.operator.openshift.io:
Version: v1alpha1
olms.operator.openshift.io:
- Annotations: {}
+ Annotations:
+ include.release.openshift.io/ibm-cloud-managed: "false"
+ include.release.openshift.io/self-managed-high-availability: "true"
ApprovedPRNumber: https://github.com/openshift/api/pull/1504
CRDName: olms.operator.openshift.io
Capability: ""
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 51c9f68ea..6e799cbc6 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -209,7 +209,7 @@ github.com/modern-go/reflect2
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
github.com/munnerz/goautoneg
-# github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf
+# github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf => github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28
## explicit; go 1.22.0
github.com/openshift/api
github.com/openshift/api/apiserver
@@ -1462,3 +1462,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
+# github.com/openshift/api => github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28