Skip to content

Commit

Permalink
Merge pull request #82 from kairos-io/cluster-init-tag
Browse files Browse the repository at this point in the history
added omitempty tag to cluster init for worker nodes
  • Loading branch information
santhoshdaivajna authored Jun 28, 2024
2 parents e0c5ebe + db6a275 commit 98e4940
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 67 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/publish.yaml

This file was deleted.

21 changes: 1 addition & 20 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,4 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- run: earthly --ci +provider-package-all-platforms --IMAGE_REPOSITORY=ghcr.io/kairos-io
build:
runs-on: ubuntu-latest
permissions:
id-token: write
strategy:
matrix:
base-image:
- quay.io/kairos/core-opensuse-leap:v2.3.2
- quay.io/kairos/core-ubuntu-20-lts:v2.3.2
- quay.io/kairos/core-ubuntu-22-lts:v2.3.2
k3s-version:
- v1.25.0+k3s1
steps:
- uses: actions/checkout@v2
- uses: docker-practice/actions-setup-docker@master
- uses: earthly/actions-setup@v1
with:
version: "v0.6.30"
- run: earthly --ci +docker-all-platforms --K3S_VERSION=${{ matrix.k3s-version }} --BASE_IMAGE=${{ matrix.base-image }}
- run: earthly --ci +provider-package-all-platforms --IMAGE_REPOSITORY=ghcr.io/kairos-io
File renamed without changes.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ build/
# Output of the go coverage tool, specifically when used with LiteIDE
*.out

.local
.local
.DS_Store
3 changes: 1 addition & 2 deletions api/k3s_config.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package api

type K3sServerConfig struct {
// ClusterInit must not have an omitempty tag, otherwise it is elided by JSON/YAML encoders when false.
ClusterInit bool `yaml:"cluster-init" json:"cluster-init"`
ClusterInit bool `yaml:"cluster-init,omitempty" json:"cluster-init,omitempty"`
Token string `yaml:"token,omitempty" json:"token,omitempty"`
Server string `yaml:"server,omitempty" json:"server,omitempty"`
TLSSan []string `yaml:"tls-san,omitempty" json:"tls-san,omitempty"`
Expand Down

0 comments on commit 98e4940

Please sign in to comment.