Backup/1107

.github/workflows/ci.yml

@@ -214,11 +214,24 @@ jobs:
           if [ "${POD_NAME}" != "" ]; then
             RESTART_COUNT=$(echo "${PODS}" | jq -r ".items[] | select(.metadata.name == \"${POD_NAME}\") | .status.containerStatuses[0].restartCount")
             if [ "${RESTART_COUNT}" != "0" ]; then
-              echo "# Previous logs:"
+              echo "# Build Controller Previous logs:"
               kubectl -n shipwright-build logs "${POD_NAME}" --previous || true
             fi
-            echo "# Logs:"
+            echo "# Build Controller Logs:"
             kubectl -n shipwright-build logs "${POD_NAME}"
           else
             echo "# Pod is missing, there are no logs to retrieve, bailing out..."
           fi
+
+          WEBHOOK_POD_NAME=$(echo "${PODS}" | jq -r '.items[] | select(.metadata.name | startswith("shipwright-build-webhook-")) | .metadata.name')
+          if [ "${WEBHOOK_POD_NAME}" != "" ]; then
+            RESTART_COUNT=$(echo "${PODS}" | jq -r ".items[] | select(.metadata.name == \"${WEBHOOK_POD_NAME}\") | .status.containerStatuses[0].restartCount")
+            if [ "${RESTART_COUNT}" != "0" ]; then
+              echo "# Build Webhook Previous logs:"
+              kubectl -n shipwright-build logs "${WEBHOOK_POD_NAME}" --previous || true
+            fi
+            echo "# Build Webhook Logs:"
+            kubectl -n shipwright-build logs "${WEBHOOK_POD_NAME}"
+          else
+            echo "# Pod is missing, there are no logs to retrieve, bailing out..."
+          fi

deploy/crds/shipwright.io_buildruns.yaml

@@ -6347,7 +6347,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -12566,7 +12566,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 

deploy/crds/shipwright.io_builds.yaml

@@ -2143,7 +2143,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -4197,7 +4197,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 

deploy/crds/shipwright.io_buildstrategies.yaml

@@ -2930,7 +2930,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - name: v1beta1
@@ -5026,7 +5026,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 

deploy/crds/shipwright.io_clusterbuildstrategies.yaml

@@ -2930,7 +2930,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - name: v1beta1
@@ -5026,7 +5026,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 

pkg/apis/build/v1alpha1/build_types.go

@@ -257,7 +257,6 @@ type BuildStatus struct {
 
 // Build is the Schema representing a Build definition
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:resource:path=builds,scope=Namespaced
 // +kubebuilder:printcolumn:name="Registered",type="string",JSONPath=".status.registered",description="The register status of the Build"
 // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.reason",description="The reason of the registered Build, either an error or succeed message"

pkg/apis/build/v1alpha1/buildrun_types.go

@@ -230,7 +230,6 @@ type ServiceAccount struct {
 
 // BuildRun is the Schema representing an instance of build execution
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:resource:path=buildruns,scope=Namespaced,shortName=br;brs
 // +kubebuilder:printcolumn:name="Succeeded",type="string",JSONPath=".status.conditions[?(@.type==\"Succeeded\")].status",description="The Succeeded status of the BuildRun"
 // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type==\"Succeeded\")].reason",description="The Succeeded reason of the BuildRun"

pkg/apis/build/v1alpha1/buildstrategy_types.go

@@ -26,7 +26,6 @@ const (
 
 // BuildStrategy is the Schema representing a strategy in the namespace scope to build images from source code.
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:resource:path=buildstrategies,scope=Namespaced,shortName=bs;bss
 type BuildStrategy struct {
 	metav1.TypeMeta   `json:",inline"`

pkg/apis/build/v1alpha1/clusterbuildstrategy_types.go

@@ -27,7 +27,6 @@ const (
 
 // ClusterBuildStrategy is the Schema representing a strategy in the cluster scope to build images from source code.
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:resource:path=clusterbuildstrategies,scope=Cluster,shortName=cbs;cbss
 type ClusterBuildStrategy struct {
 	metav1.TypeMeta   `json:",inline"`

pkg/apis/build/v1beta1/build_conversion.go

@@ -38,6 +38,12 @@ func (src *Build) ConvertTo(ctx context.Context, obj *unstructured.Unstructured)
 
 	src.Spec.ConvertTo(&alphaBuild.Spec)
 
+	alphaBuild.Status = v1alpha1.BuildStatus{
+		Registered: src.Status.Registered,
+		Reason:     (*v1alpha1.BuildReason)(src.Status.Reason),
+		Message:    src.Status.Message,
+	}
+
 	// convert annotation-controlled features
 	if src.Spec.Retention != nil && src.Spec.Retention.AtBuildDeletion != nil {
 		// We must create a new Map as otherwise the addition is not kept

pkg/apis/build/v1beta1/build_types.go

@@ -220,6 +220,7 @@ type BuildStatus struct {
 
 // Build is the Schema representing a Build definition
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 // +kubebuilder:resource:path=builds,scope=Namespaced
 // +kubebuilder:printcolumn:name="Registered",type="string",JSONPath=".status.registered",description="The register status of the Build"
 // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.reason",description="The reason of the registered Build, either an error or succeed message"
@@ -274,3 +275,18 @@ type BuildRetention struct {
 func init() {
 	SchemeBuilder.Register(&Build{}, &BuildList{})
 }
+
+// GetSourceCredentials returns the secret name for a Build Source
+func (b Build) GetSourceCredentials() *string {
+	switch b.Spec.Source.Type {
+	case OCIArtifactType:
+		if b.Spec.Source.OCIArtifact != nil && b.Spec.Source.OCIArtifact.PullSecret != nil {
+			return b.Spec.Source.OCIArtifact.PullSecret
+		}
+	default:
+		if b.Spec.Source.GitSource != nil && b.Spec.Source.GitSource.CloneSecret != nil {
+			return b.Spec.Source.GitSource.CloneSecret
+		}
+	}
+	return nil
+}

pkg/apis/build/v1beta1/buildrun_conversion.go

@@ -108,6 +108,66 @@ func (src *BuildRun) ConvertTo(ctx context.Context, obj *unstructured.Unstructur
 		})
 	}
 
+	// BuildRun Status
+	sourceStatus := []v1alpha1.SourceResult{}
+
+	if src.Status.Source != nil && src.Status.Source.Git != nil {
+		// Note: v1alpha contains a Name field under the SourceResult
+		// object, which we dont set here.
+		sourceStatus = append(sourceStatus, v1alpha1.SourceResult{
+			Git: (*v1alpha1.GitSourceResult)(src.Status.Source.Git),
+		})
+	}
+
+	if src.Status.Source != nil && src.Status.Source.OciArtifact != nil {
+		// Note: v1alpha contains a Name field under the SourceResult
+		// object, which we dont set here.
+		sourceStatus = append(sourceStatus, v1alpha1.SourceResult{
+			Bundle: (*v1alpha1.BundleSourceResult)(src.Status.Source.OciArtifact),
+		})
+	}
+
+	conditions := []v1alpha1.Condition{}
+
+	for _, c := range src.Status.Conditions {
+		ct := v1alpha1.Condition{
+			Type:               v1alpha1.Type(c.Type),
+			Status:             c.Status,
+			LastTransitionTime: c.LastTransitionTime,
+			Reason:             c.Reason,
+			Message:            c.Message,
+		}
+		conditions = append(conditions, ct)
+	}
+
+	alphaBuildRun.Status = v1alpha1.BuildRunStatus{
+		Sources:          sourceStatus,
+		Output:           (*v1alpha1.Output)(src.Status.Output),
+		Conditions:       conditions,
+		LatestTaskRunRef: src.Status.TaskRunName,
+		StartTime:        src.Status.StartTime,
+		CompletionTime:   src.Status.CompletionTime,
+	}
+
+	// Note: .Status.FailedAt is deprecated, so we do not
+	// convert it, only .Status.FailureDetails
+	if src.Status.FailureDetails != nil {
+		alphaBuildRun.Status.FailureDetails = &v1alpha1.FailureDetails{
+			Reason:  src.Status.FailureDetails.Reason,
+			Message: src.Status.FailureDetails.Message,
+			Location: &v1alpha1.FailedAt{
+				Pod:       src.Status.FailureDetails.Location.Pod,
+				Container: src.Status.FailureDetails.Location.Container,
+			},
+		}
+	}
+
+	aux := &v1alpha1.BuildSpec{}
+	if src.Status.BuildSpec != nil {
+		src.Status.BuildSpec.ConvertTo(aux)
+		alphaBuildRun.Status.BuildSpec = aux
+	}
+
 	mapito, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&alphaBuildRun)
 	if err != nil {
 		ctxlog.Error(ctx, err, "failed structuring the newObject")

pkg/apis/build/v1beta1/buildrun_types.go

@@ -213,6 +213,7 @@ type FailureDetails struct {
 
 // BuildRun is the Schema representing an instance of build execution
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 // +kubebuilder:resource:path=buildruns,scope=Namespaced,shortName=br;brs
 // +kubebuilder:printcolumn:name="Succeeded",type="string",JSONPath=".status.conditions[?(@.type==\"Succeeded\")].status",description="The Succeeded status of the BuildRun"
 // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type==\"Succeeded\")].reason",description="The Succeeded reason of the BuildRun"

pkg/apis/build/v1beta1/buildstrategy_types.go

@@ -26,6 +26,7 @@ const (
 
 // BuildStrategy is the Schema representing a strategy in the namespace scope to build images from source code.
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 // +kubebuilder:resource:path=buildstrategies,scope=Namespaced,shortName=bs;bss
 type BuildStrategy struct {
 	metav1.TypeMeta   `json:",inline"`

pkg/apis/build/v1beta1/clusterbuildstrategy_types.go

@@ -27,6 +27,7 @@ const (
 
 // ClusterBuildStrategy is the Schema representing a strategy in the cluster scope to build images from source code.
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 // +kubebuilder:resource:path=clusterbuildstrategies,scope=Cluster,shortName=cbs;cbss
 type ClusterBuildStrategy struct {
 	metav1.TypeMeta   `json:",inline"`

pkg/image/delete_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/random"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/shipwright-io/build/pkg/image"
-	utils "github.com/shipwright-io/build/test/utils/v1alpha1"
+	utils "github.com/shipwright-io/build/test/utils/v1beta1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

pkg/reconciler/build/build.go

@@ -15,7 +15,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	build "github.com/shipwright-io/build/pkg/apis/build/v1beta1"
 	"github.com/shipwright-io/build/pkg/config"
 	"github.com/shipwright-io/build/pkg/ctxlog"
 	buildmetrics "github.com/shipwright-io/build/pkg/metrics"
@@ -28,7 +28,6 @@ var validationTypes = [...]string{
 	validate.SourceURL,
 	validate.Secrets,
 	validate.Strategies,
-	validate.Sources,
 	validate.BuildName,
 	validate.Envs,
 	validate.Triggers,