From c23f97dc778e7dd55520f10a5559a5402f7233a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 07:48:40 +0000 Subject: [PATCH 1/9] Bump github.com/go-logr/logr from 1.4.1 to 1.4.2 Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/go-logr/logr/releases) - [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-logr/logr/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: github.com/go-logr/logr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f86e736..a45e541 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.22.2 require ( dario.cat/mergo v1.0.0 github.com/bmc-toolbox/bmclib/v2 v2.2.6 - github.com/go-logr/logr v1.4.1 + github.com/go-logr/logr v1.4.2 github.com/go-logr/zerologr v1.2.3 github.com/google/go-cmp v0.6.0 github.com/jacobweinstock/registrar v0.4.7 diff --git a/go.sum b/go.sum index fba1a98..e7cddc0 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-logr/zerologr v1.2.3 h1:up5N9vcH9Xck3jJkXzgyOxozT14R47IyDODz8LM1KSs= From f72a47d20b56db8e8a585f0b87889c4bc434f60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20Suslian=20=28synthe102=29?= Date: Fri, 24 May 2024 22:39:54 +0200 Subject: [PATCH 2/9] feat(intelAMT): add support for HTTPS connections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Léonard Suslian (synthe102) --- api/v1alpha1/provider_opts.go | 6 ++++++ config/crd/bases/bmc.tinkerbell.org_machines.yaml | 8 ++++++++ config/crd/bases/bmc.tinkerbell.org_tasks.yaml | 8 ++++++++ controller/client.go | 5 +++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/api/v1alpha1/provider_opts.go b/api/v1alpha1/provider_opts.go index 12e01d7..dde22b8 100644 --- a/api/v1alpha1/provider_opts.go +++ b/api/v1alpha1/provider_opts.go @@ -26,6 +26,12 @@ type IPMITOOLOptions struct { type IntelAMTOptions struct { // Port that intelAMT will use for calls. Port int `json:"port"` + + // UseHttp determines whether to use http or https for intelAMT calls. + // +optional + // +kubebuilder:validation:Enum=http;https + // +kubebuilder:default:=http + HostScheme string `json:"hostScheme"` } // HMACAlgorithm is a type for HMAC algorithms. diff --git a/config/crd/bases/bmc.tinkerbell.org_machines.yaml b/config/crd/bases/bmc.tinkerbell.org_machines.yaml index 546a05d..ee8b324 100644 --- a/config/crd/bases/bmc.tinkerbell.org_machines.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_machines.yaml @@ -74,6 +74,14 @@ spec: description: IntelAMT contains the options to customize the IntelAMT provider. properties: + hostScheme: + default: http + description: UseHttp determines whether to use http or + https for intelAMT calls. + enum: + - http + - https + type: string port: description: Port that intelAMT will use for calls. type: integer diff --git a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml index 57f04a9..8574146 100644 --- a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml @@ -75,6 +75,14 @@ spec: description: IntelAMT contains the options to customize the IntelAMT provider. properties: + hostScheme: + default: http + description: UseHttp determines whether to use http or + https for intelAMT calls. + enum: + - http + - https + type: string port: description: Port that intelAMT will use for calls. type: integer diff --git a/controller/client.go b/controller/client.go index e124a98..c74c656 100644 --- a/controller/client.go +++ b/controller/client.go @@ -77,8 +77,9 @@ func (b BMCOptions) Translate(host string) []bmclib.Option { // intelAmt options if b.IntelAMT != nil { - amt := bmclib.WithIntelAMTPort(uint32(b.IntelAMT.Port)) - o = append(o, amt) + amtPort := bmclib.WithIntelAMTPort(uint32(b.IntelAMT.Port)) + amtScheme := bmclib.WithIntelAMTHostScheme(b.IntelAMT.HostScheme) + o = append(o, amtPort, amtScheme) } // rpc options From 8f492e51085b59c975505b6df9078ef54c5257d9 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 19:45:30 -0600 Subject: [PATCH 3/9] Update api/v1alpha1/provider_opts.go update comment --- api/v1alpha1/provider_opts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1alpha1/provider_opts.go b/api/v1alpha1/provider_opts.go index dde22b8..06df397 100644 --- a/api/v1alpha1/provider_opts.go +++ b/api/v1alpha1/provider_opts.go @@ -27,7 +27,7 @@ type IntelAMTOptions struct { // Port that intelAMT will use for calls. Port int `json:"port"` - // UseHttp determines whether to use http or https for intelAMT calls. + // HostScheme determines whether to use http or https for intelAMT calls. // +optional // +kubebuilder:validation:Enum=http;https // +kubebuilder:default:=http From 131992bde6101d1680c2e97bccc5232688110823 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 19:45:42 -0600 Subject: [PATCH 4/9] Update config/crd/bases/bmc.tinkerbell.org_machines.yaml update comment --- config/crd/bases/bmc.tinkerbell.org_machines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/crd/bases/bmc.tinkerbell.org_machines.yaml b/config/crd/bases/bmc.tinkerbell.org_machines.yaml index ee8b324..d53c7fb 100644 --- a/config/crd/bases/bmc.tinkerbell.org_machines.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_machines.yaml @@ -76,7 +76,7 @@ spec: properties: hostScheme: default: http - description: UseHttp determines whether to use http or + description: HostScheme determines whether to use http or https for intelAMT calls. enum: - http From a16c3841b26a808f4aab9e6c9f92223aec8aa110 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 19:45:52 -0600 Subject: [PATCH 5/9] Update config/crd/bases/bmc.tinkerbell.org_tasks.yaml update comment --- config/crd/bases/bmc.tinkerbell.org_tasks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml index 8574146..0430b1e 100644 --- a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml @@ -77,7 +77,7 @@ spec: properties: hostScheme: default: http - description: UseHttp determines whether to use http or + description: HostScheme determines whether to use http or https for intelAMT calls. enum: - http From bf56621a7546b1fa6ca1b9c44576cd37ab289d46 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 19:46:07 -0600 Subject: [PATCH 6/9] Update config/crd/bases/bmc.tinkerbell.org_machines.yaml update capitalization --- config/crd/bases/bmc.tinkerbell.org_machines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/crd/bases/bmc.tinkerbell.org_machines.yaml b/config/crd/bases/bmc.tinkerbell.org_machines.yaml index d53c7fb..0d548eb 100644 --- a/config/crd/bases/bmc.tinkerbell.org_machines.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_machines.yaml @@ -77,7 +77,7 @@ spec: hostScheme: default: http description: HostScheme determines whether to use http or - https for intelAMT calls. + https for IntelAMT calls. enum: - http - https From 7c7a25d8bbcde96513b1e79a9c13cfda1513e4f2 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 19:46:14 -0600 Subject: [PATCH 7/9] Update config/crd/bases/bmc.tinkerbell.org_tasks.yaml update capitalization --- config/crd/bases/bmc.tinkerbell.org_tasks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml index 0430b1e..83d4e45 100644 --- a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml @@ -78,7 +78,7 @@ spec: hostScheme: default: http description: HostScheme determines whether to use http or - https for intelAMT calls. + https for IntelAMT calls. enum: - http - https From 1bd986013672c78c00b8967992bb530286314977 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 24 May 2024 20:03:27 -0600 Subject: [PATCH 8/9] Update versions for envtest and manifest generation: Run manifest and generate. Signed-off-by: Jacob Weinstock --- Makefile | 8 +- config/crd/bases/bmc.tinkerbell.org_jobs.yaml | 68 ++++++++------- .../bases/bmc.tinkerbell.org_machines.yaml | 68 +++++++-------- .../crd/bases/bmc.tinkerbell.org_tasks.yaml | 87 ++++++++++--------- config/rbac/role.yaml | 1 - 5 files changed, 116 insertions(+), 116 deletions(-) diff --git a/Makefile b/Makefile index 9807303..d3a1ab0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Image URL to use all building/pushing image targets IMG ?= quay.io/tinkerbell/rufio:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.23 +ENVTEST_K8S_VERSION = 1.28 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -68,7 +68,7 @@ cover: test ## Run unit tests with coverage report .PHONY: integration-test integration-test: manifests generate fmt vet envtest ## Run integration tests. - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... integration -coverprofile cover.out -tags=integration + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out -tags=integration ##@ Build @@ -114,7 +114,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.13.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0) KUSTOMIZE = $(shell pwd)/bin/kustomize .PHONY: kustomize @@ -177,4 +177,4 @@ puml: ## Generate PlantUML diagrams. echo "Generating $$(basename $$pml)" ; \ filename=$$(basename $$pml .puml) ; \ plantuml -tpng $$pml ; \ - done \ No newline at end of file + done diff --git a/config/crd/bases/bmc.tinkerbell.org_jobs.yaml b/config/crd/bases/bmc.tinkerbell.org_jobs.yaml index 544080e..35195bc 100644 --- a/config/crd/bases/bmc.tinkerbell.org_jobs.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_jobs.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.15.0 name: jobs.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org @@ -25,14 +24,19 @@ spec: description: Job is the Schema for the bmcjobs 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 @@ -40,8 +44,9 @@ spec: description: JobSpec defines the desired state of Job. properties: machineRef: - description: MachineRef represents the Machine resource to execute - the job. All the tasks in the job are executed for the same Machine. + description: |- + MachineRef represents the Machine resource to execute the job. + All the tasks in the job are executed for the same Machine. properties: name: description: Name of the Machine. @@ -54,15 +59,16 @@ spec: - namespace type: object tasks: - description: Tasks represents a list of baseboard management actions - to be executed. The tasks are executed sequentially. Controller - waits for one task to complete before executing the next. If a single - task fails, job execution stops and sets condition Failed. Condition - Completed is set only if all the tasks were successful. + description: |- + Tasks represents a list of baseboard management actions to be executed. + The tasks are executed sequentially. Controller waits for one task to complete before executing the next. + If a single task fails, job execution stops and sets condition Failed. + Condition Completed is set only if all the tasks were successful. items: - description: Action represents the action to be performed. A single - task can only perform one type of action. For example either PowerAction - or OneTimeBootDeviceAction. + description: |- + Action represents the action to be performed. + A single task can only perform one type of action. + For example either PowerAction or OneTimeBootDeviceAction. maxProperties: 1 properties: oneTimeBootDeviceAction: @@ -70,9 +76,9 @@ spec: management one time set boot device operation. properties: device: - description: Devices represents the boot devices, in order - for setting one time boot. Currently only the first device - in the slice is used to set one time boot. + description: |- + Devices represents the boot devices, in order for setting one time boot. + Currently only the first device in the slice is used to set one time boot. items: description: BootDevice represents boot device of the Machine. @@ -102,9 +108,9 @@ spec: kind: type: string mediaURL: - description: mediaURL represents the URL of the image to - be inserted into the virtual media, or empty to eject - media. + description: |- + mediaURL represents the URL of the image to be inserted into the virtual media, or empty to + eject media. type: string required: - kind @@ -120,7 +126,8 @@ spec: description: JobStatus defines the observed state of Job. properties: completionTime: - description: CompletionTime represents time when the job was completed. + description: |- + CompletionTime represents time when the job was completed. The completion time is only set when the job finishes successfully. format: date-time type: string @@ -134,8 +141,9 @@ spec: details about last transition. type: string status: - description: Status is the status of the Job condition. Can - be True or False. + description: |- + Status is the status of the Job condition. + Can be True or False. type: string type: description: Type of the Job condition. @@ -156,9 +164,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/bmc.tinkerbell.org_machines.yaml b/config/crd/bases/bmc.tinkerbell.org_machines.yaml index 0d548eb..a4052af 100644 --- a/config/crd/bases/bmc.tinkerbell.org_machines.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_machines.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.15.0 name: machines.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org @@ -23,14 +22,19 @@ spec: description: Machine is the Schema for the machines 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 @@ -42,10 +46,10 @@ spec: Controller. properties: authSecretRef: - description: AuthSecretRef is the SecretReference that contains - authentication information of the Machine. The Secret must contain - username and password keys. This is optional as it is not required - when using the RPC provider. + description: |- + AuthSecretRef is the SecretReference that contains authentication information of the Machine. + The Secret must contain username and password keys. This is optional as it is not required when using + the RPC provider. properties: name: description: name is unique within a namespace to reference @@ -56,6 +60,7 @@ spec: secret name must be unique. type: string type: object + x-kubernetes-map-type: atomic host: description: Host is the host IP address or hostname of the Machine. minLength: 1 @@ -76,8 +81,8 @@ spec: properties: hostScheme: default: http - description: HostScheme determines whether to use http or - https for IntelAMT calls. + description: HostScheme determines whether to use http + or https for intelAMT calls. enum: - http - https @@ -114,9 +119,9 @@ spec: provider. properties: consumerURL: - description: ConsumerURL is the URL where an rpc consumer/listener - is running and to which we will send and receive all - notifications. + description: |- + ConsumerURL is the URL where an rpc consumer/listener is running + and to which we will send and receive all notifications. type: string experimental: description: Experimental options. @@ -142,9 +147,9 @@ spec: secrets: additionalProperties: items: - description: SecretReference represents a Secret - Reference. It has enough information to retrieve - secret in any namespace + description: |- + SecretReference represents a Secret Reference. It has enough information to retrieve secret + in any namespace properties: name: description: name is unique within a namespace @@ -155,6 +160,7 @@ spec: which the secret name must be unique. type: string type: object + x-kubernetes-map-type: atomic type: array description: Secrets are a map of algorithms to secrets used for signing. @@ -199,21 +205,19 @@ spec: an HMAC signature to an HTTP request. properties: appendAlgoToHeaderDisabled: - description: 'AppendAlgoToHeaderDisabled decides whether - to append the algorithm to the signature header - or not. Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 - When set to true, a header will be added for each - algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512' + description: |- + AppendAlgoToHeaderDisabled decides whether to append the algorithm to the signature header or not. + Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 + When set to true, a header will be added for each algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512 type: boolean headerName: description: 'HeaderName is the header name that should contain the signature(s). Example: X-BMCLIB-Signature' type: string includedPayloadHeaders: - description: 'IncludedPayloadHeaders are headers whose - values will be included in the signature payload. - Example: X-BMCLIB-My-Custom-Header All headers will - be deduplicated.' + description: |- + IncludedPayloadHeaders are headers whose values will be included in the signature payload. Example: X-BMCLIB-My-Custom-Header + All headers will be deduplicated. items: type: string type: array @@ -271,9 +275,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml index 83d4e45..eb4a316 100644 --- a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml +++ b/config/crd/bases/bmc.tinkerbell.org_tasks.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.15.0 name: tasks.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org @@ -25,14 +24,19 @@ spec: description: Task is the Schema for the Task 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 @@ -43,10 +47,10 @@ spec: description: Connection represents the Machine connectivity information. properties: authSecretRef: - description: AuthSecretRef is the SecretReference that contains - authentication information of the Machine. The Secret must contain - username and password keys. This is optional as it is not required - when using the RPC provider. + description: |- + AuthSecretRef is the SecretReference that contains authentication information of the Machine. + The Secret must contain username and password keys. This is optional as it is not required when using + the RPC provider. properties: name: description: name is unique within a namespace to reference @@ -57,6 +61,7 @@ spec: secret name must be unique. type: string type: object + x-kubernetes-map-type: atomic host: description: Host is the host IP address or hostname of the Machine. minLength: 1 @@ -77,8 +82,8 @@ spec: properties: hostScheme: default: http - description: HostScheme determines whether to use http or - https for IntelAMT calls. + description: HostScheme determines whether to use http + or https for intelAMT calls. enum: - http - https @@ -115,9 +120,9 @@ spec: provider. properties: consumerURL: - description: ConsumerURL is the URL where an rpc consumer/listener - is running and to which we will send and receive all - notifications. + description: |- + ConsumerURL is the URL where an rpc consumer/listener is running + and to which we will send and receive all notifications. type: string experimental: description: Experimental options. @@ -143,9 +148,9 @@ spec: secrets: additionalProperties: items: - description: SecretReference represents a Secret - Reference. It has enough information to retrieve - secret in any namespace + description: |- + SecretReference represents a Secret Reference. It has enough information to retrieve secret + in any namespace properties: name: description: name is unique within a namespace @@ -156,6 +161,7 @@ spec: which the secret name must be unique. type: string type: object + x-kubernetes-map-type: atomic type: array description: Secrets are a map of algorithms to secrets used for signing. @@ -200,21 +206,19 @@ spec: an HMAC signature to an HTTP request. properties: appendAlgoToHeaderDisabled: - description: 'AppendAlgoToHeaderDisabled decides whether - to append the algorithm to the signature header - or not. Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 - When set to true, a header will be added for each - algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512' + description: |- + AppendAlgoToHeaderDisabled decides whether to append the algorithm to the signature header or not. + Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 + When set to true, a header will be added for each algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512 type: boolean headerName: description: 'HeaderName is the header name that should contain the signature(s). Example: X-BMCLIB-Signature' type: string includedPayloadHeaders: - description: 'IncludedPayloadHeaders are headers whose - values will be included in the signature payload. - Example: X-BMCLIB-My-Custom-Header All headers will - be deduplicated.' + description: |- + IncludedPayloadHeaders are headers whose values will be included in the signature payload. Example: X-BMCLIB-My-Custom-Header + All headers will be deduplicated. items: type: string type: array @@ -236,9 +240,9 @@ spec: one time set boot device operation. properties: device: - description: Devices represents the boot devices, in order - for setting one time boot. Currently only the first device - in the slice is used to set one time boot. + description: |- + Devices represents the boot devices, in order for setting one time boot. + Currently only the first device in the slice is used to set one time boot. items: description: BootDevice represents boot device of the Machine. type: string @@ -267,8 +271,9 @@ spec: kind: type: string mediaURL: - description: mediaURL represents the URL of the image to be - inserted into the virtual media, or empty to eject media. + description: |- + mediaURL represents the URL of the image to be inserted into the virtual media, or empty to + eject media. type: string required: - kind @@ -281,7 +286,8 @@ spec: description: TaskStatus defines the observed state of Task. properties: completionTime: - description: CompletionTime represents time when the task was completed. + description: |- + CompletionTime represents time when the task was completed. The completion time is only set when the task finishes successfully. format: date-time type: string @@ -295,8 +301,9 @@ spec: details about last transition. type: string status: - description: Status is the status of the Task condition. Can - be True or False. + description: |- + Status is the status of the Task condition. + Can be True or False. type: string type: description: Type of the Task condition. @@ -316,9 +323,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 45d0b8f..93dc1e1 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: From aef7bb628940b0ee2f5c01df76fd062713cc84cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 08:34:30 +0000 Subject: [PATCH 9/9] Bump alpine from 3.19 to 3.20 Bumps alpine from 3.19 to 3.20. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb7f226..e34c384 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ARG TARGETOS # Build RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -o manager main.go -FROM alpine:3.19 +FROM alpine:3.20 # Install ipmitool required by the third party BMC lib. RUN apk add --upgrade ipmitool=1.8.19-r1