f

Author: thetechnick

api/v1/clusterextensionrevision_types.go

@@ -35,7 +35,7 @@ type ClusterExtensionRevisionSpec struct {
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="revision is immutable"
 	Revision int64 `json:"revision"`
 	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="phases is immutable"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf || oldSelf.size() == 0", message="phases is immutable"
 	Phases []ClusterExtensionRevisionPhase `json:"phases"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="previous is immutable"
 	Previous []ClusterExtensionRevisionPrevious `json:"previous,omitempty"`
@@ -59,6 +59,7 @@ const (
 type ClusterExtensionRevisionPhase struct {
 	Name    string                           `json:"name"`
 	Objects []ClusterExtensionRevisionObject `json:"objects"`
+	Slices  []string                         `json:"slices,omitempty"`
 }
 
 type ClusterExtensionRevisionObject struct {

api/v1/clusterobjectslice_types.go

@@ -0,0 +1,37 @@
+package v1
+
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:subresource:status
+
+// ClusterObjectSlice is the Schema for the clusterobjectslices API
+type ClusterObjectSlice struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="objects is immutable"
+	// +kubebuilder:MaxItems=32
+	Objects []ClusterExtensionRevisionObject `json:"objects"`
+}
+
+// +kubebuilder:object:root=true
+
+// ClusterObjectSliceList contains a list of ClusterObjectSlice
+type ClusterObjectSliceList struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	// items is a required list of ClusterObjectSlice objects.
+	//
+	// +kubebuilder:validation:Required
+	Items []ClusterObjectSlice `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ClusterObjectSlice{}, &ClusterObjectSliceList{})
+}

api/v1/zz_generated.deepcopy.go

@@ -63,9 +63,9 @@ kubectl_wait_for_query() {
 
 kubectl apply -f "https://github.com/cert-manager/cert-manager/releases/download/${cert_mgr_version}/cert-manager.yaml"
 # Wait for cert-manager to be fully ready
-kubectl_wait "cert-manager" "deployment/cert-manager-webhook" "60s"
-kubectl_wait "cert-manager" "deployment/cert-manager-cainjector" "60s"
-kubectl_wait "cert-manager" "deployment/cert-manager" "60s"
+kubectl_wait "cert-manager" "deployment/cert-manager-webhook" "6000s"
+kubectl_wait "cert-manager" "deployment/cert-manager-cainjector" "6000s"
+kubectl_wait "cert-manager" "deployment/cert-manager" "6000s"
 kubectl_wait_for_query "mutatingwebhookconfigurations/cert-manager-webhook" '{.webhooks[0].clientConfig.caBundle}' 60 5
 kubectl_wait_for_query "validatingwebhookconfigurations/cert-manager-webhook" '{.webhooks[0].clientConfig.caBundle}' 60 5
 
@@ -77,5 +77,5 @@ kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager"
 
 if [[ "${install_default_catalogs}" != "false" ]]; then
     kubectl apply -f "${default_catalogs_manifest}"
-    kubectl wait --for=condition=Serving "clustercatalog/operatorhubio" --timeout="60s"
+    kubectl wait --for=condition=Serving "clustercatalog/operatorhubio" --timeout="6000s"
 fi