Skip to content

Commit

Permalink
add missing comments for status fields (#316)
Browse files Browse the repository at this point in the history
Upstream-repository: api
Upstream-commit: bdb0455258b952da961e4d2d97b6214a974e0554
  • Loading branch information
grokspawn authored and ci-robot committed Feb 27, 2024
1 parent 7d004c0 commit 301e9c8
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 8 deletions.
3 changes: 3 additions & 0 deletions manifests/0000_50_olm_00-catalogsources.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ spec:
- type
x-kubernetes-list-type: map
configMapReference:
description: ConfigMapReference (deprecated) is the reference to the ConfigMap containing the catalog source's configuration, when the catalog source is a ConfigMap
type: object
required:
- name
Expand All @@ -702,6 +703,7 @@ spec:
description: UID is a type that holds unique ID values, including UUIDs. Because we don't ONLY use UUIDs, this is an alias to string. Being a type captures intent and helps make sure that UIDs and names do not get conflated.
type: string
connectionState:
description: ConnectionState represents the current state of the CatalogSource's connection to the registry
type: object
required:
- lastObservedState
Expand All @@ -724,6 +726,7 @@ spec:
description: Reason is the reason the CatalogSource was transitioned to its current state.
type: string
registryService:
description: RegistryService represents the current state of the GRPC service used to serve the catalog
type: object
properties:
createdAt:
Expand Down
3 changes: 3 additions & 0 deletions microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ spec:
- type
x-kubernetes-list-type: map
configMapReference:
description: ConfigMapReference (deprecated) is the reference to the ConfigMap containing the catalog source's configuration, when the catalog source is a ConfigMap
type: object
required:
- name
Expand All @@ -702,6 +703,7 @@ spec:
description: UID is a type that holds unique ID values, including UUIDs. Because we don't ONLY use UUIDs, this is an alias to string. Being a type captures intent and helps make sure that UIDs and names do not get conflated.
type: string
connectionState:
description: ConnectionState represents the current state of the CatalogSource's connection to the registry
type: object
required:
- lastObservedState
Expand All @@ -724,6 +726,7 @@ spec:
description: Reason is the reason the CatalogSource was transitioned to its current state.
type: string
registryService:
description: RegistryService represents the current state of the GRPC service used to serve the catalog
type: object
properties:
createdAt:
Expand Down
3 changes: 3 additions & 0 deletions staging/api/crds/operators.coreos.com_catalogsources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ spec:
- type
x-kubernetes-list-type: map
configMapReference:
description: ConfigMapReference (deprecated) is the reference to the ConfigMap containing the catalog source's configuration, when the catalog source is a ConfigMap
type: object
required:
- name
Expand All @@ -698,6 +699,7 @@ spec:
description: UID is a type that holds unique ID values, including UUIDs. Because we don't ONLY use UUIDs, this is an alias to string. Being a type captures intent and helps make sure that UIDs and names do not get conflated.
type: string
connectionState:
description: ConnectionState represents the current state of the CatalogSource's connection to the registry
type: object
required:
- lastObservedState
Expand All @@ -720,6 +722,7 @@ spec:
description: Reason is the reason the CatalogSource was transitioned to its current state.
type: string
registryService:
description: RegistryService represents the current state of the GRPC service used to serve the catalog
type: object
properties:
createdAt:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/zz_defs.go

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions staging/api/pkg/operators/v1alpha1/catalogsource_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,12 @@ type CatalogSourceStatus struct {
// The last time the CatalogSource image registry has been polled to ensure the image is up-to-date
LatestImageRegistryPoll *metav1.Time `json:"latestImageRegistryPoll,omitempty"`

ConfigMapResource *ConfigMapResourceReference `json:"configMapReference,omitempty"`
RegistryServiceStatus *RegistryServiceStatus `json:"registryService,omitempty"`
GRPCConnectionState *GRPCConnectionState `json:"connectionState,omitempty"`
// ConfigMapReference (deprecated) is the reference to the ConfigMap containing the catalog source's configuration, when the catalog source is a ConfigMap
ConfigMapResource *ConfigMapResourceReference `json:"configMapReference,omitempty"`
// RegistryService represents the current state of the GRPC service used to serve the catalog
RegistryServiceStatus *RegistryServiceStatus `json:"registryService,omitempty"`
// ConnectionState represents the current state of the CatalogSource's connection to the registry
GRPCConnectionState *GRPCConnectionState `json:"connectionState,omitempty"`

// Represents the state of a CatalogSource. Note that Message and Reason represent the original
// status information, which may be migrated to be conditions based in the future. Any new features
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/operator-framework/api/crds/zz_defs.go

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 301e9c8

Please sign in to comment.