Skip to content

Commit

Permalink
Merge pull request #704 from juanluisvaladas/fix-manifests
Browse files Browse the repository at this point in the history 
Fix make manifests generation and CI
  • Loading branch information
@juanluisvaladas
juanluisvaladas authored Sep 2, 2024
2 parents 7a08e32 + 545fd50 commit d2e18e8
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 301 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
~/.cache/golangci-lint
- name: Check generated code to be consistent
run: make generate manifests clusterapi-manifests docs-generate-reference && git diff --exit-code
run: make clean && make generate manifests clusterapi-manifests docs-generate-reference release && git diff --exit-code

- name: Run linter
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ manifests_targets += config/crd/bases/k0smotron.io_jointokenrequests.yaml
manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sconfigs.yaml
manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigs.yaml
manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigtemplates.yaml
manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0scontrollerconfigs.yaml
manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml
manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
manifests_targets += config/crd/bases/infrastructure.cluster.x-k8s.io_remoteclusters.yaml
Expand Down
99 changes: 0 additions & 99 deletions config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
View file

This file was deleted.

1 change: 0 additions & 1 deletion config/crd/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
- bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigs.yaml
- bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigtemplates.yaml
- bases/bootstrap.cluster.x-k8s.io_k0scontrollerconfigs.yaml
- bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
- bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml
- bases/controlplane.cluster.x-k8s.io_k0scontrolplanetemplates.yaml
- bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
Expand Down
199 changes: 0 additions & 199 deletions docs/resource-reference.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1205,8 +1205,6 @@ This should be only set in the case you want to use a pre-generated join token.

Resource Types:

- [K0sControllerConfig](#k0scontrollerconfig)

- [K0sControlPlane](#k0scontrolplane)

- [K0sControlPlaneTemplate](#k0scontrolplanetemplate)
Expand All @@ -1218,203 +1216,6 @@ Resource Types:



## K0sControllerConfig
<sup><sup>[↩ Parent](#controlplaneclusterx-k8siov1beta1 )</sup></sup>








<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>apiVersion</b></td>
<td>string</td>
<td>controlplane.cluster.x-k8s.io/v1beta1</td>
<td>true</td>
</tr>
<tr>
<td><b>kind</b></td>
<td>string</td>
<td>K0sControllerConfig</td>
<td>true</td>
</tr>
<tr>
<td><b><a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta">metadata</a></b></td>
<td>object</td>
<td>Refer to the Kubernetes API documentation for the fields of the `metadata` field.</td>
<td>true</td>
</tr><tr>
<td><b><a href="#k0scontrollerconfigspec-1">spec</a></b></td>
<td>object</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#k0scontrollerconfigstatus-1">status</a></b></td>
<td>object</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### K0sControllerConfig.spec
<sup><sup>[↩ Parent](#k0scontrollerconfig-1)</sup></sup>





<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>args</b></td>
<td>[]string</td>
<td>
Args specifies extra arguments to be passed to k0s worker. See: https://docs.k0sproject.io/stable/advanced/worker-configuration/<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>downloadURL</b></td>
<td>string</td>
<td>
DownloadURL specifies the URL to download k0s binary from. If specified the version field is ignored and what ever version is downloaded from the URL is used.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#k0scontrollerconfigspecfilesindex-1">files</a></b></td>
<td>[]object</td>
<td>
Files specifies extra files to be passed to user_data upon creation.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>k0s</b></td>
<td>object</td>
<td>
K0s defines the k0s configuration. Note, that some fields will be overwritten by k0smotron. If empty, will be used default configuration. @see https://docs.k0sproject.io/stable/configuration/<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>postStartCommands</b></td>
<td>[]string</td>
<td>
PostStartCommands specifies commands to be run after starting k0s worker.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>preInstalledK0s</b></td>
<td>boolean</td>
<td>
PreInstallK0s specifies whether k0s binary is pre-installed on the node.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>preStartCommands</b></td>
<td>[]string</td>
<td>
PreStartCommands specifies commands to be run before starting k0s worker.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### K0sControllerConfig.spec.files[index]
<sup><sup>[↩ Parent](#k0scontrollerconfigspec-1)</sup></sup>





<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>content</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>path</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>permissions</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### K0sControllerConfig.status
<sup><sup>[↩ Parent](#k0scontrollerconfig-1)</sup></sup>





<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>dataSecretName</b></td>
<td>string</td>
<td>
DataSecretName is the name of the secret that stores the bootstrap data script.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>ready</b></td>
<td>boolean</td>
<td>
Ready indicates the Bootstrapdata field is ready to be consumed<br/>
</td>
<td>false</td>
</tr></tbody>
</table>

## K0sControlPlane
<sup><sup>[↩ Parent](#controlplaneclusterx-k8siov1beta1 )</sup></sup>

Expand Down

0 comments on commit d2e18e8

Please sign in to comment.