Skip to content

Commit

Permalink
CRDBUMPER-vendor-new-api
Browse files Browse the repository at this point in the history
Vendor v1alpha3 API from github.com/DataWorkflowServices/dws.

ACTION: If any of the code in this repo was referencing non-local
  APIs, the references to them may have been inadvertently
  modified. Verify that any non-local APIs are being referenced
  by their correct versions.

ACTION: Begin by running "make vet". Repair any issues that it finds.
  Then run "make test" and continue repairing issues until the tests
  pass.
Signed-off-by: Matt Richerson <[email protected]>
  • Loading branch information
matthew-richerson committed Nov 13, 2024
1 parent 4ef2c58 commit 7444dd7
Show file tree
Hide file tree
Showing 99 changed files with 9,609 additions and 1,315 deletions.
45 changes: 30 additions & 15 deletions api/v1alpha1/zz_generated.conversion.go

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

45 changes: 30 additions & 15 deletions api/v1alpha2/zz_generated.conversion.go

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

18 changes: 9 additions & 9 deletions api/v1alpha3/nnf_resource_status_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package v1alpha3

import (
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
dwsv1alpha3 "github.com/DataWorkflowServices/dws/api/v1alpha3"

sf "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models"
)
Expand Down Expand Up @@ -95,22 +95,22 @@ func (rst NnfResourceStatusType) UpdateIfWorseThan(status *NnfResourceStatusType
}
}

func (rst NnfResourceStatusType) ConvertToDWSResourceStatus() dwsv1alpha2.ResourceStatus {
func (rst NnfResourceStatusType) ConvertToDWSResourceStatus() dwsv1alpha3.ResourceStatus {
switch rst {
case ResourceStarting:
return dwsv1alpha2.StartingStatus
return dwsv1alpha3.StartingStatus
case ResourceReady:
return dwsv1alpha2.ReadyStatus
return dwsv1alpha3.ReadyStatus
case ResourceDisabled:
return dwsv1alpha2.DisabledStatus
return dwsv1alpha3.DisabledStatus
case ResourceNotPresent:
return dwsv1alpha2.NotPresentStatus
return dwsv1alpha3.NotPresentStatus
case ResourceOffline:
return dwsv1alpha2.OfflineStatus
return dwsv1alpha3.OfflineStatus
case ResourceFailed:
return dwsv1alpha2.FailedStatus
return dwsv1alpha3.FailedStatus
default:
return dwsv1alpha2.UnknownStatus
return dwsv1alpha3.UnknownStatus
}
}

Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha3/nnfaccess_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package v1alpha3

import (
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
dwsv1alpha3 "github.com/DataWorkflowServices/dws/api/v1alpha3"
"github.com/DataWorkflowServices/dws/utils/updater"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -37,7 +37,7 @@ type NnfAccessSpec struct {
// be torn down and deleted.
// +kubebuilder:validation:Enum:=PreRun;PostRun;Teardown
// +kubebuilder:validation:Type:=string
TeardownState dwsv1alpha2.WorkflowState `json:"teardownState"`
TeardownState dwsv1alpha3.WorkflowState `json:"teardownState"`

// Target specifies which storage targets the client should mount
// - single: Only one of the storage the client can access
Expand Down Expand Up @@ -82,7 +82,7 @@ type NnfAccessStatus struct {
// Ready signifies whether status.state has been achieved
Ready bool `json:"ready"`

dwsv1alpha2.ResourceError `json:",inline"`
dwsv1alpha3.ResourceError `json:",inline"`
}

//+kubebuilder:object:root=true
Expand Down
Loading

0 comments on commit 7444dd7

Please sign in to comment.