Merge pull request #701 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -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
@@ -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
@@ -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:

microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -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
@@ -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
@@ -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:

staging/api/.github/workflows/go.yaml

@@ -30,10 +30,11 @@ jobs:
           ${{ runner.os }}-go-
     - name: unit-test
       run: go test -v ./... -coverprofile cover.out
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       with:
         files: cover.out
         functionalities: fixes
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   go-apidiff:
     name: go-apidiff

staging/api/crds/operators.coreos.com_catalogsources.yaml

@@ -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
@@ -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
@@ -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:

staging/api/crds/zz_defs.go

@@ -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