Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.2] Add Operator Descriptors to properly render node placement on UI (#864) #868

Merged
merged 1 commit into from
Oct 7, 2020
Merged

[release-1.2] Add Operator Descriptors to properly render node placement on UI (#864) #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion ...t-hyperconverged/1.2.0/kubevirt-hyperconverged-operator.v1.2.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
categories: OpenShift Optional
certified: "false"
containerImage: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:d015b58b0ed77fb20eab5cf5c4d530b3eebcba03fc75e571b1ec56dace9cb254
createdAt: "2020-10-06 07:10:47"
createdAt: "2020-10-07 17:32:30"
description: |-
**HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products.
Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt,
Expand Down Expand Up @@ -88,6 +88,42 @@ spec:
displayName: HyperConverged Cluster Operator Deployment
kind: HyperConverged
name: hyperconvergeds.hco.kubevirt.io
specDescriptors:
- description: nodeAffinity describes node affinity scheduling rules for the infra pods.
displayName: Infra components node affinity
path: infra.nodePlacement.affinity.nodeAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:nodeAffinity
- description: podAffinity describes pod affinity scheduling rules for the infra pods.
displayName: Infra components pod affinity
path: infra.nodePlacement.affinity.podAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:podAffinity
- description: podAntiAffinity describes pod anti affinity scheduling rules for the infra pods.
displayName: Infra components pod anti-affinity
path: infra.nodePlacement.affinity.podAntiAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:podAntiAffinity
- description: nodeAffinity describes node affinity scheduling rules for the workloads pods.
displayName: Workloads components node affinity
path: workloads.nodePlacement.affinity.nodeAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:nodeAffinity
- description: podAffinity describes pod affinity scheduling rules for the workloads pods.
displayName: Workloads components pod affinity
path: workloads.nodePlacement.affinity.podAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:podAffinity
- description: podAntiAffinity describes pod anti affinity scheduling rules for the workloads pods.
displayName: Workloads components pod anti-affinity
path: workloads.nodePlacement.affinity.podAntiAffinity
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:podAntiAffinity
- description: HIDDEN FIELDS - operator version.
displayName: HIDDEN FIELDS - operator version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
version: v1beta1
- description: V2V Vmware
displayName: V2V Vmware
Expand Down
61 changes: 61 additions & 0 deletions pkg/components/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,67 @@ func GetCSVBase(name, namespace, displayName, description, image, replaces strin
Kind: "HyperConverged",
DisplayName: crdDisplay + " Deployment",
Description: "Represents the deployment of " + crdDisplay,
// TODO: move this to annotations on hyperconverged_types.go once kubebuilder
// properly supports SpecDescriptors as the operator-sdk already does
SpecDescriptors: []csvv1alpha1.SpecDescriptor{
{
DisplayName: "Infra components node affinity",
Description: "nodeAffinity describes node affinity scheduling rules for the infra pods.",
Path: "infra.nodePlacement.affinity.nodeAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:nodeAffinity",
},
},
{
DisplayName: "Infra components pod affinity",
Description: "podAffinity describes pod affinity scheduling rules for the infra pods.",
Path: "infra.nodePlacement.affinity.podAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:podAffinity",
},
},
{
DisplayName: "Infra components pod anti-affinity",
Description: "podAntiAffinity describes pod anti affinity scheduling rules for the infra pods.",
Path: "infra.nodePlacement.affinity.podAntiAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:podAntiAffinity",
},
},
{
DisplayName: "Workloads components node affinity",
Description: "nodeAffinity describes node affinity scheduling rules for the workloads pods.",
Path: "workloads.nodePlacement.affinity.nodeAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:nodeAffinity",
},
},
{
DisplayName: "Workloads components pod affinity",
Description: "podAffinity describes pod affinity scheduling rules for the workloads pods.",
Path: "workloads.nodePlacement.affinity.podAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:podAffinity",
},
},
{
DisplayName: "Workloads components pod anti-affinity",
Description: "podAntiAffinity describes pod anti affinity scheduling rules for the workloads pods.",
Path: "workloads.nodePlacement.affinity.podAntiAffinity",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:podAntiAffinity",
},
},
{
DisplayName: "HIDDEN FIELDS - operator version",
Description: "HIDDEN FIELDS - operator version.",
Path: "version",
XDescriptors: []string{
"urn:alm:descriptor:com.tectonic.ui:hidden",
},
},
},
StatusDescriptors: []csvv1alpha1.StatusDescriptor{},
},
// TODO: remove once oVirt and VMware providers are removed from HCO
{
Expand Down