Skip to content

Commit

Permalink
Update Rufio version: (#2520)
Browse files Browse the repository at this point in the history 
* Update Rufio version:

This version has the provider options feature.

Signed-off-by: Jacob Weinstock <[email protected]>

* Update Rufio CRDs

Signed-off-by: Jacob Weinstock <[email protected]>

---------

Signed-off-by: Jacob Weinstock <[email protected]>
  • Loading branch information
@jacobweinstock
jacobweinstock authored Sep 29, 2023
1 parent 3dbe898 commit 0ed48ce
Show file tree
Hide file tree
Showing 10 changed files with 483 additions and 171 deletions.
2 changes: 1 addition & 1 deletion UPSTREAM_PROJECTS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ projects:
go_version: "1.17"
- name: rufio
versions:
- commit: a6b208f19c9ee97fb9d9211cfdd26b971eac90ae
- commit: 1065313bc6ba811cabf5c4ed92be0bcf4a3b1993
go_version: "1.20"
- name: tink
versions:
Expand Down
260 changes: 136 additions & 124 deletions projects/tinkerbell/rufio/ATTRIBUTION.txt
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions projects/tinkerbell/rufio/CHECKSUMS
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
4a3448788fabe3ff65fb3cc848b4c783571fc0ef1316bcaff569268167ded138 _output/bin/rufio/linux-amd64/manager
450ebf9818be09982ad6edf8f0eb679d64afdd9ad61986534624b0e801c03817 _output/bin/rufio/linux-arm64/manager
d7d1f9a10130d7d35f6c928915b28579c3059635d50c04186f36d5e60a00ff86 _output/bin/rufio/linux-amd64/manager
724753057135e25297cc65d34f4bce3a2ec454bacf58b558f30d4cba2a47861d _output/bin/rufio/linux-arm64/manager
2 changes: 1 addition & 1 deletion projects/tinkerbell/rufio/GIT_TAG
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6b208f19c9ee97fb9d9211cfdd26b971eac90ae
1065313bc6ba811cabf5c4ed92be0bcf4a3b1993
2 changes: 1 addition & 1 deletion projects/tinkerbell/tinkerbell-chart/GIT_TAG
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.1
0.2.2
2 changes: 1 addition & 1 deletion projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.2.1
version: 0.2.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
29 changes: 18 additions & 11 deletions projects/tinkerbell/tinkerbell-chart/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.0
name: jobs.bmc.tinkerbell.org
spec:
group: bmc.tinkerbell.org
Expand All @@ -22,7 +21,7 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Job is the Schema for the bmcjobs API
description: Job is the Schema for the bmcjobs API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -37,7 +36,7 @@ spec:
metadata:
type: object
spec:
description: JobSpec defines the desired state of Job
description: JobSpec defines the desired state of Job.
properties:
machineRef:
description: MachineRef represents the Machine resource to execute
Expand Down Expand Up @@ -95,6 +94,20 @@ spec:
- cycle
- reset
type: string
virtualMediaAction:
description: VirtualMediaAction represents a baseboard management
virtual media insert/eject.
properties:
kind:
type: string
mediaURL:
description: mediaURL represents the URL of the image to
be inserted into the virtual media, or empty to eject
media.
type: string
required:
- kind
type: object
type: object
minItems: 1
type: array
Expand All @@ -103,7 +116,7 @@ spec:
- tasks
type: object
status:
description: JobStatus defines the observed state of Job
description: JobStatus defines the observed state of Job.
properties:
completionTime:
description: CompletionTime represents time when the job was completed.
Expand Down Expand Up @@ -142,9 +155,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
173 changes: 156 additions & 17 deletions projects/tinkerbell/tinkerbell-chart/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
clusterctl.cluster.x-k8s.io: ""
clusterctl.cluster.x-k8s.io/move: ""
controller-gen.kubebuilder.io/version: v0.13.0
name: machines.bmc.tinkerbell.org
spec:
group: bmc.tinkerbell.org
Expand All @@ -23,7 +19,7 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Machine is the Schema for the machines API
description: Machine is the Schema for the machines API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -38,7 +34,7 @@ spec:
metadata:
type: object
spec:
description: MachineSpec defines desired machine state
description: MachineSpec defines desired machine state.
properties:
connection:
description: Connection contains connection data for a Baseboard Management
Expand All @@ -47,7 +43,8 @@ spec:
authSecretRef:
description: AuthSecretRef is the SecretReference that contains
authentication information of the Machine. The Secret must contain
username and password keys.
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
Expand All @@ -58,6 +55,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
Expand All @@ -69,17 +67,163 @@ spec:
default: 623
description: Port is the port number for connecting with the Machine.
type: integer
providerOptions:
description: ProviderOptions contains provider specific options.
properties:
intelAMT:
description: IntelAMT contains the options to customize the
IntelAMT provider.
properties:
port:
description: Port that intelAMT will use for calls.
type: integer
required:
- port
type: object
ipmitool:
description: IPMITOOL contains the options to customize the
Ipmitool provider.
properties:
cipherSuite:
description: CipherSuite that ipmitool will use for calls.
type: string
port:
description: Port that ipmitool will use for calls.
type: integer
type: object
redfish:
description: Redfish contains the options to customize the
Redfish provider.
properties:
port:
description: Port that redfish will use for calls.
type: integer
required:
- port
type: object
rpc:
description: RPC contains the options to customize the RPC
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.
type: string
experimental:
description: Experimental options.
properties:
customRequestPayload:
description: CustomRequestPayload must be in json.
type: string
dotPath:
description: 'DotPath is the path to the json object
where the bmclib RequestPayload{} struct will be
embedded. For example: object.data.body'
type: string
type: object
hmac:
description: HMAC is the options used to create a HMAC
signature.
properties:
prefixSigDisabled:
description: 'PrefixSigDisabled determines whether
the algorithm will be prefixed to the signature.
Example: sha256=abc123'
type: boolean
secrets:
additionalProperties:
items:
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
to reference a secret resource.
type: string
namespace:
description: namespace defines the space within
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.
type: object
type: object
logNotificationsDisabled:
description: LogNotificationsDisabled determines whether
responses from rpc consumer/listeners will be logged
or not.
type: boolean
request:
description: Request is the options used to create the
rpc HTTP request.
properties:
httpContentType:
description: HTTPContentType is the content type to
use for the rpc request notification.
type: string
httpMethod:
description: HTTPMethod is the HTTP method to use
for the rpc request notification.
type: string
staticHeaders:
additionalProperties:
items:
type: string
type: array
description: StaticHeaders are predefined headers
that will be added to every request.
type: object
timestampFormat:
description: TimestampFormat is the time format for
the timestamp header.
type: string
timestampHeader:
description: 'TimestampHeader is the header name that
should contain the timestamp. Example: X-BMCLIB-Timestamp'
type: string
type: object
signature:
description: Signature is the options used for adding
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'
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.'
items:
type: string
type: array
type: object
required:
- consumerURL
type: object
type: object
required:
- authSecretRef
- host
- insecureTLS
- port
type: object
required:
- connection
type: object
status:
description: MachineStatus defines the observed state of Machine
description: MachineStatus defines the observed state of Machine.
properties:
conditions:
description: Conditions represents the latest available observations
Expand Down Expand Up @@ -112,16 +256,11 @@ spec:
enum:
- "on"
- "off"
- unknown
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit 0ed48ce

Please sign in to comment.