From 1bc8a6d1864c90d9fe9ca5dc6dff1a58071cf4d0 Mon Sep 17 00:00:00 2001 From: sujeet01 Date: Wed, 24 Apr 2024 15:21:11 +0530 Subject: [PATCH] Fix duplicate .PHONY target `openapi-extractor` with `extract-openapi` --- Makefile | 2 +- gen/swagger.json | 9 +++++++-- gen/v3/apis__compute.ironcore.dev__v1alpha1_openapi.json | 5 +++-- .../apis__networking.ironcore.dev__v1alpha1_openapi.json | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d1948b5f1..a9ad71b36 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ test: manifests generate fmt vet test-only ## Run tests. test-only: envtest ## Run *only* the tests - no generation, linting etc. KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out -.PHONY: openapi-extractor +.PHONY: extract-openapi extract-openapi: envtest openapi-extractor KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" $(OPENAPI_EXTRACTOR) \ --apiserver-package="github.com/ironcore-dev/ironcore/cmd/ironcore-apiserver" \ diff --git a/gen/swagger.json b/gen/swagger.json index 02324c01e..562d64504 100644 --- a/gen/swagger.json +++ b/gen/swagger.json @@ -65240,13 +65240,14 @@ "format": "int64" }, "state": { - "description": "State is the infrastructure state of the machine.\n\nPossible enum values:\n - `\"Pending\"` means the Machine has been accepted by the system, but not yet completely started. This includes time before being bound to a MachinePool, as well as time spent setting up the Machine on that MachinePool.\n - `\"Running\"` means the machine is running on a MachinePool.\n - `\"Shutdown\"` means the machine is shut down.\n - `\"Terminated\"` means the machine has been permanently stopped and cannot be started.", + "description": "State is the infrastructure state of the machine.\n\nPossible enum values:\n - `\"Pending\"` means the Machine has been accepted by the system, but not yet completely started. This includes time before being bound to a MachinePool, as well as time spent setting up the Machine on that MachinePool.\n - `\"Running\"` means the machine is running on a MachinePool.\n - `\"Shutdown\"` means the machine is shut down.\n - `\"Terminated\"` means the machine has been permanently stopped and cannot be started.\n - `\"Terminating\"` means the machine that is terminating.", "type": "string", "enum": [ "Pending", "Running", "Shutdown", - "Terminated" + "Terminated", + "Terminating" ] }, "volumes": { @@ -66486,6 +66487,10 @@ "name": { "description": "Name is the name of the network peering.", "type": "string" + }, + "state": { + "description": "State represents the network peering state", + "type": "string" } } }, diff --git a/gen/v3/apis__compute.ironcore.dev__v1alpha1_openapi.json b/gen/v3/apis__compute.ironcore.dev__v1alpha1_openapi.json index 54fd94213..7ef0992da 100644 --- a/gen/v3/apis__compute.ironcore.dev__v1alpha1_openapi.json +++ b/gen/v3/apis__compute.ironcore.dev__v1alpha1_openapi.json @@ -4706,13 +4706,14 @@ "format": "int64" }, "state": { - "description": "State is the infrastructure state of the machine.\n\nPossible enum values:\n - `\"Pending\"` means the Machine has been accepted by the system, but not yet completely started. This includes time before being bound to a MachinePool, as well as time spent setting up the Machine on that MachinePool.\n - `\"Running\"` means the machine is running on a MachinePool.\n - `\"Shutdown\"` means the machine is shut down.\n - `\"Terminated\"` means the machine has been permanently stopped and cannot be started.", + "description": "State is the infrastructure state of the machine.\n\nPossible enum values:\n - `\"Pending\"` means the Machine has been accepted by the system, but not yet completely started. This includes time before being bound to a MachinePool, as well as time spent setting up the Machine on that MachinePool.\n - `\"Running\"` means the machine is running on a MachinePool.\n - `\"Shutdown\"` means the machine is shut down.\n - `\"Terminated\"` means the machine has been permanently stopped and cannot be started.\n - `\"Terminating\"` means the machine that is terminating.", "type": "string", "enum": [ "Pending", "Running", "Shutdown", - "Terminated" + "Terminated", + "Terminating" ] }, "volumes": { diff --git a/gen/v3/apis__networking.ironcore.dev__v1alpha1_openapi.json b/gen/v3/apis__networking.ironcore.dev__v1alpha1_openapi.json index e85121cb5..ddb3181ed 100644 --- a/gen/v3/apis__networking.ironcore.dev__v1alpha1_openapi.json +++ b/gen/v3/apis__networking.ironcore.dev__v1alpha1_openapi.json @@ -11910,6 +11910,10 @@ "description": "Name is the name of the network peering.", "type": "string", "default": "" + }, + "state": { + "description": "State represents the network peering state", + "type": "string" } } },