Skip to content

Commit

Permalink
Merge pull request #13 from ca-gip/upgrade-128
Browse files Browse the repository at this point in the history
⬆️ Upgrade for Kubernetes 1.28
  • Loading branch information
zkonak authored Aug 5, 2024
2 parents 451bdea + ded160f commit 72b3563
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 182 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Push to Docker Hub registry
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
push: true
tags: cagip/kotary:${{ github.ref_name }}
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
- name: Run Tests
run: make test
- name: Convert coverage to lcov
Expand All @@ -26,7 +26,7 @@ jobs:
infile: coverage.out
outfile: coverage.lcov
- name: Coveralls, publish coverage results
uses: coverallsapp/github-action@v2.2.0
uses: coverallsapp/github-action@v2.3.0
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: coverage.lcov
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.24.0
v1.28.0
4 changes: 2 additions & 2 deletions artifacts/crd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ spec:
properties:
cpu:
x-kubernetes-int-or-string: true
pattern: '([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'
pattern: '^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'
memory:
x-kubernetes-int-or-string: true
pattern: '([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'
pattern: '^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'
status:
type: object
properties:
Expand Down
66 changes: 32 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module github.com/ca-gip/kotary

go 1.21
go 1.22

require (
github.com/ahl5esoft/golang-underscore v2.0.0+incompatible
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/client_golang v1.19.1
github.com/storageos/go-api v2.6.0+incompatible
github.com/troian/healthcheck v0.1.3
gotest.tools/v3 v3.5.1
k8s.io/api v0.26.13
k8s.io/apimachinery v0.26.13
k8s.io/apiserver v0.26.13
k8s.io/client-go v0.26.13
k8s.io/code-generator v0.26.13
k8s.io/klog/v2 v2.120.1
k8s.io/kubernetes v1.26.13
k8s.io/api v0.28.12
k8s.io/apimachinery v0.28.12
k8s.io/apiserver v0.28.12
k8s.io/client-go v0.28.12
k8s.io/code-generator v0.28.12
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.28.12
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -26,54 +26,52 @@ require (
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.0 // indirect
golang.org/x/tools v0.16.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cluster-bootstrap v0.0.0 // indirect
k8s.io/component-base v0.26.13 // indirect
k8s.io/component-base v0.28.12 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

// Dépendances indirectes, on doit spéficier la version car certains packages Kubernetes l'importes en version v0.0.0 ...
replace (
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.13
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.13
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12
)
Loading

0 comments on commit 72b3563

Please sign in to comment.