diff --git a/.markdownlintignore b/.markdownlintignore index e9a3bdc..9ef8faf 100644 --- a/.markdownlintignore +++ b/.markdownlintignore @@ -1,2 +1,3 @@ deployments -docs/_legacy \ No newline at end of file +docs/_legacy +testbed \ No newline at end of file diff --git a/apis/nodecore/v1alpha1/flavour_types.go b/apis/nodecore/v1alpha1/flavour_types.go index 6212af1..9cb70d3 100644 --- a/apis/nodecore/v1alpha1/flavour_types.go +++ b/apis/nodecore/v1alpha1/flavour_types.go @@ -146,6 +146,15 @@ type FlavourStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Provider ID",type=string,JSONPath=`.spec.providerID` +// +kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type` +// +kubebuilder:printcolumn:name="CPU",type=string,priority=1,JSONPath=`.spec.characteristics.cpu` +// +kubebuilder:printcolumn:name="Memory",type=string,priority=1,JSONPath=`.spec.characteristics.memory` +// +kubebuilder:printcolumn:name="Owner Name",type=string,priority=1,JSONPath=`.spec.owner.nodeID` +// +kubebuilder:printcolumn:name="Owner Domain",type=string,priority=1,JSONPath=`.spec.owner.domain` +// +kubebuilder:printcolumn:name="Available",type=boolean,JSONPath=`.spec.optionalFields.availability` +// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp` + // Flavour is the Schema for the flavours API type Flavour struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/nodecore/v1alpha1/zz_generated.deepcopy.go b/apis/nodecore/v1alpha1/zz_generated.deepcopy.go index 4f86197..1651f69 100644 --- a/apis/nodecore/v1alpha1/zz_generated.deepcopy.go +++ b/apis/nodecore/v1alpha1/zz_generated.deepcopy.go @@ -169,14 +169,6 @@ func (in *Flavour) DeepCopy() *Flavour { return out } -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Flavour) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FlavourList) DeepCopyInto(out *FlavourList) { *out = *in diff --git a/apis/reservation/v1alpha1/contract_types.go b/apis/reservation/v1alpha1/contract_types.go index cab5cd8..fbea2fe 100644 --- a/apis/reservation/v1alpha1/contract_types.go +++ b/apis/reservation/v1alpha1/contract_types.go @@ -72,6 +72,15 @@ type ContractStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Flavour ID",type=string,JSONPath=`.spec.flavour.metadata.name` +// +kubebuilder:printcolumn:name="Buyer Name",type=string,JSONPath=`.spec.buyer.nodeID` +// +kubebuilder:printcolumn:name="Buyer Domain",type=string,priority=1,JSONPath=`.spec.buyer.domain` +// +kubebuilder:printcolumn:name="Seller Name",type=string,JSONPath=`.spec.seller.nodeID` +// +kubebuilder:printcolumn:name="Seller Domain",type=string,priority=1,JSONPath=`.spec.seller.domain` +// +kubebuilder:printcolumn:name="Transaction ID",type=string,priority=1,JSONPath=`.spec.transactionID` +// +kubebuilder:printcolumn:name="Buyer Liqo ID",type=string,priority=1,JSONPath=`.spec.buyerClusterID` +// +kubebuilder:printcolumn:name="Expiration Time",type=string,priority=1,JSONPath=`.spec.expirationTime` + // Contract is the Schema for the contracts API type Contract struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/reservation/v1alpha1/reservation_types.go b/apis/reservation/v1alpha1/reservation_types.go index 9d11237..8e67dad 100644 --- a/apis/reservation/v1alpha1/reservation_types.go +++ b/apis/reservation/v1alpha1/reservation_types.go @@ -79,11 +79,12 @@ type ReservationStatus struct { // +kubebuilder:printcolumn:name="Solver ID",type=string,JSONPath=`.spec.solverID` // +kubebuilder:printcolumn:name="Reserve",type=boolean,JSONPath=`.spec.reserve` // +kubebuilder:printcolumn:name="Purchase",type=boolean,JSONPath=`.spec.purchase` -// +kubebuilder:printcolumn:name="Seller",type=string,JSONPath=`.spec.seller.name` +// +kubebuilder:printcolumn:name="Seller Name",type=string,JSONPath=`.spec.seller.nodeID` +// +kubebuilder:printcolumn:name="Seller Domain",type=string,priority=1,JSONPath=`.spec.buyer.domain` // +kubebuilder:printcolumn:name="Peering Candidate",type=string,priority=1,JSONPath=`.spec.peeringCandidate.name` // +kubebuilder:printcolumn:name="Transaction ID",type=string,JSONPath=`.status.transactionID` -// +kubebuilder:printcolumn:name="Reserve Phase",type=string,priority=1,JSONPath=`.status.reservePhase.phase` -// +kubebuilder:printcolumn:name="Purchase Phase",type=string,priority=1,JSONPath=`.status.purchasePhase.phase` +// +kubebuilder:printcolumn:name="Reserve Phase",type=string,priority=1,JSONPath=`.status.reservePhase` +// +kubebuilder:printcolumn:name="Purchase Phase",type=string,priority=1,JSONPath=`.status.purchasePhase` // +kubebuilder:printcolumn:name="Contract Name",type=string,JSONPath=`.status.contract.name` // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.phase.phase` // +kubebuilder:printcolumn:name="Message",type=string,priority=1,JSONPath=`.status.phase.message` diff --git a/apis/reservation/v1alpha1/transaction_types.go b/apis/reservation/v1alpha1/transaction_types.go index 3b65bc6..0338cde 100644 --- a/apis/reservation/v1alpha1/transaction_types.go +++ b/apis/reservation/v1alpha1/transaction_types.go @@ -47,6 +47,13 @@ type TransactionStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Flavour ID",type="string",JSONPath=".spec.flavourID" +// +kubebuilder:printcolumn:name="Buyer Name",type="string",JSONPath=".spec.buyer.nodeID" +// +kubebuilder:printcolumn:name="Buyer IP",type="string",priority=1,JSONPath=".spec.buyer.ip" +// +kubebuilder:printcolumn:name="Buyer Domain",type="string",priority=1,JSONPath=".spec.buyer.domain" +// +kubebuilder:printcolumn:name="Cluster ID",type="string",JSONPath=".spec.clusterID" +// +kubebuilder:printcolumn:name="Start Time",type="string",JSONPath=".spec.startTime" + // Transaction is the Schema for the transactions API type Transaction struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/reservation/v1alpha1/zz_generated.deepcopy.go b/apis/reservation/v1alpha1/zz_generated.deepcopy.go index bbcfeef..b039010 100644 --- a/apis/reservation/v1alpha1/zz_generated.deepcopy.go +++ b/apis/reservation/v1alpha1/zz_generated.deepcopy.go @@ -41,14 +41,6 @@ func (in *Contract) DeepCopy() *Contract { return out } -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Contract) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ContractList) DeepCopyInto(out *ContractList) { *out = *in @@ -281,14 +273,6 @@ func (in *Transaction) DeepCopy() *Transaction { return out } -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Transaction) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TransactionList) DeepCopyInto(out *TransactionList) { *out = *in diff --git a/deployments/node/crds/nodecore.fluidos.eu_flavours.yaml b/deployments/node/crds/nodecore.fluidos.eu_flavours.yaml index 43d2954..f49c8ec 100644 --- a/deployments/node/crds/nodecore.fluidos.eu_flavours.yaml +++ b/deployments/node/crds/nodecore.fluidos.eu_flavours.yaml @@ -14,7 +14,36 @@ spec: singular: flavour scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .spec.providerID + name: Provider ID + type: string + - jsonPath: .spec.type + name: Type + type: string + - jsonPath: .spec.characteristics.cpu + name: CPU + priority: 1 + type: string + - jsonPath: .spec.characteristics.memory + name: Memory + priority: 1 + type: string + - jsonPath: .spec.owner.nodeID + name: Owner Name + priority: 1 + type: string + - jsonPath: .spec.owner.domain + name: Owner Domain + priority: 1 + type: string + - jsonPath: .spec.optionalFields.availability + name: Available + type: boolean + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: Flavour is the Schema for the flavours API @@ -236,5 +265,4 @@ spec: type: object served: true storage: true - subresources: - status: {} + subresources: {} diff --git a/deployments/node/crds/reservation.fluidos.eu_contracts.yaml b/deployments/node/crds/reservation.fluidos.eu_contracts.yaml index 593493f..42e796c 100644 --- a/deployments/node/crds/reservation.fluidos.eu_contracts.yaml +++ b/deployments/node/crds/reservation.fluidos.eu_contracts.yaml @@ -14,7 +14,37 @@ spec: singular: contract scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .spec.flavour.metadata.name + name: Flavour ID + type: string + - jsonPath: .spec.buyer.nodeID + name: Buyer Name + type: string + - jsonPath: .spec.buyer.domain + name: Buyer Domain + priority: 1 + type: string + - jsonPath: .spec.seller.nodeID + name: Seller Name + type: string + - jsonPath: .spec.seller.domain + name: Seller Domain + priority: 1 + type: string + - jsonPath: .spec.transactionID + name: Transaction ID + priority: 1 + type: string + - jsonPath: .spec.buyerClusterID + name: Buyer Liqo ID + priority: 1 + type: string + - jsonPath: .spec.expirationTime + name: Expiration Time + priority: 1 + type: string + name: v1alpha1 schema: openAPIV3Schema: description: Contract is the Schema for the contracts API @@ -418,5 +448,4 @@ spec: type: object served: true storage: true - subresources: - status: {} + subresources: {} diff --git a/deployments/node/crds/reservation.fluidos.eu_reservations.yaml b/deployments/node/crds/reservation.fluidos.eu_reservations.yaml index 0e84480..e026631 100644 --- a/deployments/node/crds/reservation.fluidos.eu_reservations.yaml +++ b/deployments/node/crds/reservation.fluidos.eu_reservations.yaml @@ -24,8 +24,12 @@ spec: - jsonPath: .spec.purchase name: Purchase type: boolean - - jsonPath: .spec.seller.name - name: Seller + - jsonPath: .spec.seller.nodeID + name: Seller Name + type: string + - jsonPath: .spec.buyer.domain + name: Seller Domain + priority: 1 type: string - jsonPath: .spec.peeringCandidate.name name: Peering Candidate @@ -34,11 +38,11 @@ spec: - jsonPath: .status.transactionID name: Transaction ID type: string - - jsonPath: .status.reservePhase.phase + - jsonPath: .status.reservePhase name: Reserve Phase priority: 1 type: string - - jsonPath: .status.purchasePhase.phase + - jsonPath: .status.purchasePhase name: Purchase Phase priority: 1 type: string diff --git a/deployments/node/crds/reservation.fluidos.eu_transactions.yaml b/deployments/node/crds/reservation.fluidos.eu_transactions.yaml index ec04673..4fe1b38 100644 --- a/deployments/node/crds/reservation.fluidos.eu_transactions.yaml +++ b/deployments/node/crds/reservation.fluidos.eu_transactions.yaml @@ -14,7 +14,28 @@ spec: singular: transaction scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .spec.flavourID + name: Flavour ID + type: string + - jsonPath: .spec.buyer.nodeID + name: Buyer Name + type: string + - jsonPath: .spec.buyer.ip + name: Buyer IP + priority: 1 + type: string + - jsonPath: .spec.buyer.domain + name: Buyer Domain + priority: 1 + type: string + - jsonPath: .spec.clusterID + name: Cluster ID + type: string + - jsonPath: .spec.startTime + name: Start Time + type: string + name: v1alpha1 schema: openAPIV3Schema: description: Transaction is the Schema for the transactions API @@ -131,5 +152,4 @@ spec: type: object served: true storage: true - subresources: - status: {} + subresources: {} diff --git a/examples/kind/README.md b/examples/kind/README.md deleted file mode 100644 index 7e3937f..0000000 --- a/examples/kind/README.md +++ /dev/null @@ -1,92 +0,0 @@ -# - -