Skip to content

Commit b7adbc1

Browse files
andreacv98andreacv98
authored
Liqo allocation binding #1 (#43)
1 parent f0734c6 commit b7adbc1

21 files changed

+564
-662
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ generate-controller: controller-gen
9090
# download controller-gen if necessary
9191
controller-gen:
9292
ifeq (, $(shell which controller-gen))
93-
@go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0
93+
@go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
9494
CONTROLLER_GEN=$(GOBIN)/controller-gen
9595
else
9696
CONTROLLER_GEN=$(shell which controller-gen)

‎apis/nodecore/v1alpha1/allocation_types.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,8 @@ type AllocationSpec struct {
7171
// if true it represents only a placeholder to undertand that the cluster is just a proxy to another cluster
7272
Forwarding bool `json:"forwarding,omitempty"`
7373

74-
// This Flavour describes the characteristics of the allocation, it is based on the Flavour CRD from which it was created
75-
Flavour Flavour `json:"flavour"`
76-
77-
// This flags indicates if the Flavour from which the allocation was created was partitioned or not
78-
Partitioned bool `json:"partitioned"`
79-
80-
// This is the dimension of the allocation
81-
Resources Characteristics `json:"resources,omitempty"`
74+
// This is the reference to the contract related to the allocation
75+
Contract GenericRef `json:"contract,omitempty"`
8276
}
8377

8478
// AllocationStatus defines the observed state of Allocation.

‎apis/nodecore/v1alpha1/zz_generated.deepcopy.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deployments/node/crds/advertisement.fluidos.eu_discoveries.yaml

Lines changed: 94 additions & 91 deletions
Large diffs are not rendered by default.

‎deployments/node/crds/advertisement.fluidos.eu_peeringcandidates.yaml

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: peeringcandidates.advertisement.fluidos.eu
88
spec:
99
group: advertisement.fluidos.eu
@@ -20,14 +20,19 @@ spec:
2020
description: PeeringCandidate is the Schema for the peeringcandidates API
2121
properties:
2222
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2628
type: string
2729
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3136
type: string
3237
metadata:
3338
type: object
@@ -40,16 +45,19 @@ spec:
4045
description: Flavour is the Schema for the flavours API.
4146
properties:
4247
apiVersion:
43-
description: 'APIVersion defines the versioned schema of this
44-
representation of an object. Servers should convert recognized
45-
schemas to the latest internal value, and may reject unrecognized
46-
values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
48+
description: |-
49+
APIVersion defines the versioned schema of this representation of an object.
50+
Servers should convert recognized schemas to the latest internal value, and
51+
may reject unrecognized values.
52+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4753
type: string
4854
kind:
49-
description: 'Kind is a string value representing the REST resource
50-
this object represents. Servers may infer this from the endpoint
51-
the client submits requests to. Cannot be updated. In CamelCase.
52-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
55+
description: |-
56+
Kind is a string value representing the REST resource this object represents.
57+
Servers may infer this from the endpoint the client submits requests to.
58+
Cannot be updated.
59+
In CamelCase.
60+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5361
type: string
5462
metadata:
5563
properties:
@@ -74,10 +82,9 @@ spec:
7482
description: FlavourSpec defines the desired state of Flavour
7583
properties:
7684
characteristics:
77-
description: Characteristics contains the characteristics
78-
of the Flavour. They are based on the type of the Flavour
79-
and can change depending on it. In this case, the type is
80-
K8S so the characteristics are CPU, Memory, GPU and EphemeralStorage.
85+
description: |-
86+
Characteristics contains the characteristics of the Flavour.
87+
They are based on the type of the Flavour and can change depending on it. In this case, the type is K8S so the characteristics are CPU, Memory, GPU and EphemeralStorage.
8188
properties:
8289
architecture:
8390
description: Architecture is the architecture of the Flavour.
@@ -134,15 +141,14 @@ spec:
134141
- pods
135142
type: object
136143
optionalFields:
137-
description: This field is used to specify the optional fields
138-
that can be retrieved from the Flavour. In the future it
139-
will be expanded to include more optional fields defined
140-
in the REAR Protocol or custom ones.
144+
description: |-
145+
This field is used to specify the optional fields that can be retrieved from the Flavour.
146+
In the future it will be expanded to include more optional fields defined in the REAR Protocol or custom ones.
141147
properties:
142148
availability:
143-
description: Availability is the availability flag of
144-
the Flavour. It is a field inherited from the REAR Protocol
145-
specifications.
149+
description: |-
150+
Availability is the availability flag of the Flavour.
151+
It is a field inherited from the REAR Protocol specifications.
146152
type: boolean
147153
workerID:
148154
description: WorkerID is the ID of the worker that provides
@@ -265,10 +271,9 @@ spec:
265271
- period
266272
type: object
267273
providerID:
268-
description: ProviderID is the ID of the FLUIDOS Node ID that
269-
provides this Flavour. It can correspond to ID of the owner
270-
FLUIDOS Node or to the ID of a FLUIDOS SuperNode that represents
271-
the entry point to a FLUIDOS Domain
274+
description: |-
275+
ProviderID is the ID of the FLUIDOS Node ID that provides this Flavour.
276+
It can correspond to ID of the owner FLUIDOS Node or to the ID of a FLUIDOS SuperNode that represents the entry point to a FLUIDOS Domain
272277
type: string
273278
type:
274279
description: Type is the type of the Flavour. Currently, only

0 commit comments

Comments
 (0)