Skip to content

Commit a2a4c4b

Browse files
committed
Update dependencies and API versions
1 parent 2879704 commit a2a4c4b

15 files changed

Lines changed: 77 additions & 295 deletions

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ test: manifests generate fmt vet envtest ## Run tests.
6868

6969
.PHONY: build
7070
build: manifests generate fmt vet ## Build manager binary.
71-
go build -o bin/manager cmd/main.go
71+
go build -o bin/manager main.go
7272

7373
.PHONY: run
7474
run: manifests generate fmt vet ## Run a controller from your host.
75-
ENABLE_WEBHOOKS="false" go run ./cmd/main.go
75+
ENABLE_WEBHOOKS="false" go run ./main.go
7676

7777
# If you wish to build the manager image targeting other platforms you can use the --platform flag.
7878
# (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.

PROJECT

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
domain: elx.cloud
22
layout:
3-
- go.kubebuilder.io/v3
3+
- go.kubebuilder.io/v3
44
projectName: elx-nodegroup-controller
55
repo: github.com/elastx/elx-nodegroup-controller
66
resources:
7-
- api:
8-
crdVersion: v1
9-
controller: true
10-
domain: elx.cloud
11-
group: k8s
12-
kind: NodeGroup
13-
path: github.com/elastx/elx-nodegroup-controller/api/v1alpha1
14-
version: v1alpha1
7+
- api:
8+
crdVersion: v1
9+
controller: true
10+
domain: elx.cloud
11+
group: k8s
12+
kind: NodeGroup
13+
path: github.com/elastx/elx-nodegroup-controller/api/v1alpha2
14+
version: v1alpha2
1515
version: "3"

api/v1alpha1/groupversion_info.go

Lines changed: 0 additions & 36 deletions
This file was deleted.

api/v1alpha1/nodegroup_types.go

Lines changed: 0 additions & 59 deletions
This file was deleted.

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 135 deletions
This file was deleted.

api/v1alpha2/groupversion_info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ limitations under the License.
1515
*/
1616

1717
// Package v1alpha1 contains API Schema definitions for the k8s v1alpha1 API group
18-
//+kubebuilder:object:generate=true
19-
//+groupName=k8s.elx.cloud
18+
// +kubebuilder:object:generate=true
19+
// +groupName=k8s.elx.cloud
2020
package v1alpha1
2121

2222
import (

api/v1alpha2/zz_generated.deepcopy.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/k8s.elx.cloud_nodegroups.yaml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
97
name: nodegroups.k8s.elx.cloud
108
spec:
119
group: k8s.elx.cloud
@@ -22,14 +20,19 @@ spec:
2220
description: NodeGroup is the Schema for the nodegroups API
2321
properties:
2422
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
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
2828
type: string
2929
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
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
3336
type: string
3437
metadata:
3538
type: object
@@ -43,22 +46,29 @@ spec:
4346
items:
4447
type: string
4548
type: array
49+
nodeGroupNames:
50+
items:
51+
type: string
52+
type: array
4653
taints:
4754
items:
48-
description: The node this Taint is attached to has the "effect"
49-
on any pod that does not tolerate the Taint.
55+
description: |-
56+
The node this Taint is attached to has the "effect" on
57+
any pod that does not tolerate the Taint.
5058
properties:
5159
effect:
52-
description: Required. The effect of the taint on pods that
53-
do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule
54-
and NoExecute.
60+
description: |-
61+
Required. The effect of the taint on pods
62+
that do not tolerate the taint.
63+
Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
5564
type: string
5665
key:
5766
description: Required. The taint key to be applied to a node.
5867
type: string
5968
timeAdded:
60-
description: TimeAdded represents the time at which the taint
61-
was added. It is only written for NoExecute taints.
69+
description: |-
70+
TimeAdded represents the time at which the taint was added.
71+
It is only written for NoExecute taints.
6272
format: date-time
6373
type: string
6474
value:
@@ -77,9 +87,3 @@ spec:
7787
storage: true
7888
subresources:
7989
status: {}
80-
status:
81-
acceptedNames:
82-
kind: ""
83-
plural: ""
84-
conditions: []
85-
storedVersions: []

config/rbac/role.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole
54
metadata:
6-
creationTimestamp: null
75
name: manager-role
86
rules:
97
- apiGroups:

0 commit comments

Comments
 (0)