Skip to content

Commit

Permalink
Merge pull request #17 from flant/add-0.29.support
Browse files Browse the repository at this point in the history
Add 1.29.support
  • Loading branch information
name212 authored Sep 27, 2024
2 parents 34ad199 + cacd6a0 commit 7d2d3d5
Show file tree
Hide file tree
Showing 7 changed files with 666 additions and 71 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
name: Run Go linters
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.20
- name: Set up Go 1.23
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.23'
id: go

- name: Check out addon-operator code
- name: Check out code
uses: actions/checkout@v3

- name: Restore Go modules
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Run golangci-lint
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.54.2
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.61.0
./golangci-lint run --sort-results
codespell:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Run unit tests
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.20
- name: Set up Go 1.23
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.23'
id: go

- name: Check out addon-operator code
Expand Down
2 changes: 1 addition & 1 deletion fake/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type Cluster struct {

func NewFakeCluster(ver ClusterVersion) *Cluster {
if ver == "" {
ver = ClusterVersionV125
ver = ClusterVersionV127
}
cres := ClusterResources(ver)

Expand Down
3 changes: 3 additions & 0 deletions fake/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ func ClusterResources(version ClusterVersion) []*metav1.APIResourceList {

case ClusterVersionV128:
return v128ClusterResources
case ClusterVersionV129:
return v129ClusterResources
}

return nil
Expand All @@ -75,6 +77,7 @@ const (
ClusterVersionV126 ClusterVersion = "v1.26.0"
ClusterVersionV127 ClusterVersion = "v1.27.0"
ClusterVersionV128 ClusterVersion = "v1.28.0"
ClusterVersionV129 ClusterVersion = "v1.29.0"
)

func (cv ClusterVersion) String() string {
Expand Down
Loading

0 comments on commit 7d2d3d5

Please sign in to comment.