From 0867a7d38d91eda80b8d1457f7be611140d9e21f Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 24 Aug 2020 13:31:45 -0400 Subject: [PATCH] bug 1871890: add current profile annotations to CVO manifests This is matches https://github.com/openshift/enhancements/pull/414 and doesn't change existing behavior --- console/v1/0000_10_consoleclidownload.crd.yaml | 1 + console/v1/0000_10_consoleexternalloglink.crd.yaml | 1 + console/v1/0000_10_consolelink.crd.yaml | 1 + console/v1/0000_10_consolenotification.crd.yaml | 1 + console/v1/0000_10_consoleyamlsample.crd.yaml | 1 + helm/v1beta1/0000_10-helm-chart-repository.crd.yaml | 2 ++ operatoringress/v1/0000_50_dns-record.yaml | 2 ++ 7 files changed, 9 insertions(+) diff --git a/console/v1/0000_10_consoleclidownload.crd.yaml b/console/v1/0000_10_consoleclidownload.crd.yaml index 95e45531786..d5e36cb6f21 100644 --- a/console/v1/0000_10_consoleclidownload.crd.yaml +++ b/console/v1/0000_10_consoleclidownload.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: name: consoleclidownloads.console.openshift.io annotations: + include.release.openshift.io/self-managed-high-availability: "true" displayName: ConsoleCLIDownload description: Extension for configuring openshift web console command line interface (CLI) downloads. diff --git a/console/v1/0000_10_consoleexternalloglink.crd.yaml b/console/v1/0000_10_consoleexternalloglink.crd.yaml index a992377a150..9a31cf92dd3 100644 --- a/console/v1/0000_10_consoleexternalloglink.crd.yaml +++ b/console/v1/0000_10_consoleexternalloglink.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: name: consoleexternalloglinks.console.openshift.io annotations: + include.release.openshift.io/self-managed-high-availability: "true" displayName: ConsoleExternalLogLinks description: ConsoleExternalLogLink is an extension for customizing OpenShift web console log links. diff --git a/console/v1/0000_10_consolelink.crd.yaml b/console/v1/0000_10_consolelink.crd.yaml index 20745439b6f..f62f541f6fb 100644 --- a/console/v1/0000_10_consolelink.crd.yaml +++ b/console/v1/0000_10_consolelink.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: name: consolelinks.console.openshift.io annotations: + include.release.openshift.io/self-managed-high-availability: "true" displayName: ConsoleLinks description: Extension for customizing OpenShift web console links spec: diff --git a/console/v1/0000_10_consolenotification.crd.yaml b/console/v1/0000_10_consolenotification.crd.yaml index 715e0f5013b..8135b728e00 100644 --- a/console/v1/0000_10_consolenotification.crd.yaml +++ b/console/v1/0000_10_consolenotification.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: name: consolenotifications.console.openshift.io annotations: + include.release.openshift.io/self-managed-high-availability: "true" displayName: ConsoleNotification description: Extension for configuring openshift web console notifications. spec: diff --git a/console/v1/0000_10_consoleyamlsample.crd.yaml b/console/v1/0000_10_consoleyamlsample.crd.yaml index f097466b12d..e0e3796ea7a 100644 --- a/console/v1/0000_10_consoleyamlsample.crd.yaml +++ b/console/v1/0000_10_consoleyamlsample.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: name: consoleyamlsamples.console.openshift.io annotations: + include.release.openshift.io/self-managed-high-availability: "true" displayName: ConsoleYAMLSample description: Extension for configuring openshift web console YAML samples. spec: diff --git a/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml b/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml index a7f8d994b6d..75af27ec29c 100644 --- a/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml +++ b/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: helmchartrepositories.helm.openshift.io + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: scope: Cluster preserveUnknownFields: false diff --git a/operatoringress/v1/0000_50_dns-record.yaml b/operatoringress/v1/0000_50_dns-record.yaml index 59a30475733..ab3db4ddfe6 100644 --- a/operatoringress/v1/0000_50_dns-record.yaml +++ b/operatoringress/v1/0000_50_dns-record.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: dnsrecords.ingress.operator.openshift.io + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: group: ingress.operator.openshift.io names: