From bf10386a639541b2ac34c53a0e48bee51e646e3b Mon Sep 17 00:00:00 2001 From: narcis96 Date: Mon, 4 Mar 2024 15:49:29 +0200 Subject: [PATCH] (ci): build using make --- .github/workflows/e2e.yaml | 9 ++ Makefile | 2 +- ...astructure.cluster.x-k8s.io_vclusters.yaml | 85 ++++++++++--------- 3 files changed, 54 insertions(+), 42 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 3cab8e51..bd2ccac5 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -48,3 +48,12 @@ jobs: uses: actions/setup-go@v4 with: go-version: "1.22" + + - name: Make help + run: | + make help + make install + make build + + - name: Build with Make + run: make build diff --git a/Makefile b/Makefile index b200ca1c..3f0a5c31 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi CONTROLLER_GEN = $(shell pwd)/bin/controller-gen .PHONY: controller-gen controller-gen: ## Download controller-gen locally if necessary. - $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0) KUSTOMIZE = $(shell pwd)/bin/kustomize .PHONY: kustomize diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_vclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_vclusters.yaml index 0514dee0..5c6bcc8b 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_vclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_vclusters.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: vclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -21,14 +20,19 @@ spec: description: VCluster is the Schema for the vclusters API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -51,8 +55,9 @@ spec: - port type: object helmRelease: - description: The helm release configuration for the virtual cluster. - This is optional, but when filled, specified chart will be deployed. + description: |- + The helm release configuration for the virtual cluster. This is optional, but + when filled, specified chart will be deployed. properties: chart: description: infos about what chart to deploy @@ -72,9 +77,10 @@ spec: type: string type: object kubernetesVersion: - description: Kubernetes version that should be used in this vcluster - instance, e.g. "1.23". Versions out of the supported range will - be ignored, and earliest/latest supported version will be used instead. + description: |- + Kubernetes version that should be used in this vcluster instance, e.g. "1.23". + Versions out of the supported range will be ignored, and earliest/latest supported + version will be used instead. type: string type: object status: @@ -88,36 +94,37 @@ spec: operational state. properties: lastTransitionTime: - description: Last time the condition transitioned from one status - to another. This should be when the underlying condition changed. - If that is not known, then using the time when the API field - changed is acceptable. + description: |- + Last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when + the API field changed is acceptable. format: date-time type: string message: - description: A human readable message indicating details about - the transition. This field may be empty. + description: |- + A human readable message indicating details about the transition. + This field may be empty. type: string reason: - description: The reason for the condition's last transition - in CamelCase. The specific API may choose whether this field - is considered a guaranteed API. This field may not be empty. + description: |- + The reason for the condition's last transition in CamelCase. + The specific API may choose whether this field is considered a guaranteed API. + This field may not be empty. type: string severity: - description: Severity provides an explicit classification of - Reason code, so the users or machines can immediately understand - the current situation and act accordingly. The Severity field - MUST be set only when Status=False. + description: |- + Severity provides an explicit classification of Reason code, so the users or machines can immediately + understand the current situation and act accordingly. + The Severity field MUST be set only when Status=False. type: string status: description: Status of the condition, one of True, False, Unknown. type: string type: - description: Type of condition in CamelCase or in foo.example.com/CamelCase. - Many .condition.type values are consistent across resources - like Available, but because arbitrary conditions can be useful - (see .node.status.conditions), the ability to deconflict is - important. + description: |- + Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources like Available, but because arbitrary conditions + can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: - status @@ -129,8 +136,9 @@ spec: was initialized. type: boolean message: - description: Message describes the reason in human readable form why - the cluster is in the currrent phase + description: |- + Message describes the reason in human readable form why the cluster is in the currrent + phase type: string observedGeneration: description: ObservedGeneration is the latest generation observed @@ -146,8 +154,9 @@ spec: ready. type: boolean reason: - description: Reason describes the reason in machine readable form - why the cluster is in the current phase + description: |- + Reason describes the reason in machine readable form why the cluster is in the current + phase type: string type: object type: object @@ -155,9 +164,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: []