Skip to content

Commit f950211

Browse files
camilamacedo86varshaprasad96
camilamacedo86
and
varshaprasad96
authored
Upgrade deps with go 1.17 (operator-framework#5505)
* upgrades * latest updates * latest updates * update .cncf-maintainers * Update changelog/fragments/upgrades.yaml Co-authored-by: Varsha <[email protected]> Co-authored-by: Varsha <[email protected]>
1 parent b8e8b53 commit f950211

File tree

44 files changed

+874
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+874
-309
lines changed

Diff for: ‎.cncf-maintainers

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
approvers:
22
- asmacdo
33
- camilamacedo86
4-
- estroz
54
- fabianvf
5+
- jberkhahn
66
- jmrodri
77
- joelanford
88
- marc-obrien
@@ -12,7 +12,6 @@ approvers:
1212
reviewers:
1313
- asmacdo
1414
- camilamacedo86
15-
- estroz
1615
- fabianvf
1716
- jberkhahn
1817
- jmrodri

Diff for: ‎.github/workflows/deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: install
4646
uses: actions/setup-go@v2
4747
with:
48-
go-version: 1.16
48+
go-version: 1.17
4949

5050
- name: gpg init
5151
if: github.event_name != 'pull_request'

Diff for: ‎.github/workflows/integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.16
31+
go-version: 1.17
3232
- uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0

Diff for: ‎.github/workflows/test-ansible.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.16
31+
go-version: 1.17
3232
- uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/setup-go@v2
4545
with:
46-
go-version: 1.16
46+
go-version: 1.17
4747
- uses: actions/checkout@v2
4848
with:
4949
fetch-depth: 0

Diff for: ‎.github/workflows/test-go.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.16
31+
go-version: 1.17
3232
- uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/setup-go@v2
4545
with:
46-
go-version: 1.16
46+
go-version: 1.17
4747
- uses: actions/checkout@v2
4848
with:
4949
fetch-depth: 0

Diff for: ‎.github/workflows/test-helm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.16
31+
go-version: 1.17
3232
- uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0

Diff for: ‎.github/workflows/test-sanity.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.16
31+
go-version: 1.17
3232
id: go
3333
- uses: actions/checkout@v2
3434
with:

Diff for: ‎changelog/fragments/upgrades.yaml

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
(go/v3) upgrade go version from 1.16 to 1.17 and the following dependencies:
6+
- upgrade controller-runtime from `0.10.0` to `0.11.0`
7+
- k8s from `1.22` to `1.23`
8+
- controller-gen from `v0.0.7` to `v0.8.0`
9+
10+
# kind is one of:
11+
# - addition
12+
# - change
13+
# - deprecation
14+
# - removal
15+
# - bugfix
16+
kind: "change"
17+
18+
# Is this a breaking change?
19+
breaking: false
20+
21+
# NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS
22+
# FILE FOR A PREVIOUSLY MERGED PULL_REQUEST!
23+
#
24+
# The generator auto-detects the PR number from the commit
25+
# message in which this file was originally added.
26+
#
27+
# What is the pull request number (without the "#")?
28+
# pull_request_override: 0
29+
30+
31+
# Migration can be defined to automatically add a section to
32+
# the migration guide. This is required for breaking changes.
33+
migration:
34+
header: (go/v3) Upgrade go and dependencies
35+
body: |
36+
Upgrade controller-runtime from `0.10.0` to `0.11.0`, k8s from `1.22` to `1.23` and controller-gen from `v0.0.7` to `v0.8.0`.
37+
Following the steps to update your project.
38+
1) Update the go.mod file with:
39+
40+
```
41+
go 1.17
42+
43+
require (
44+
github.com/onsi/ginkgo v1.16.5
45+
github.com/onsi/gomega v1.17.0
46+
k8s.io/api v0.23.0
47+
k8s.io/apimachinery v0.23.0
48+
k8s.io/client-go v0.23.0
49+
sigs.k8s.io/controller-runtime v0.11.0
50+
)
51+
```
52+
2) Run `go mod tidy`
53+
54+
Now, let's update the Makefile targets accordingly:
55+
56+
1) Replace `ENVTEST_K8S_VERSION = 1.22` with `ENVTEST_K8S_VERSION = 1.23`
57+
2) Replace `sigs.k8s.io/controller-tools/cmd/[email protected]` with `sigs.k8s.io/controller-tools/cmd/[email protected]`
58+
3) Run `make manifests` and `make generate` to ensure that you will update your manifests with the new versions
59+
4) You might want to run `make all` to ensure that all updates were done accordinly and succeffully
60+
- description: >
61+
The debug log level for the sidecar container kube-rbac-proxy was reduced from 10 to 0
62+
kind: "change"
63+
# Is this a breaking change?
64+
breaking: false
65+
# Migration can be defined to automatically add a section to
66+
# the migration guide. This is required for breaking changes.
67+
migration:
68+
header: Reduce debug log level for the sidecar container kube-rbac-proxy from 10 to 0
69+
body: |
70+
Update the file `config/default/manager_auth_proxy_patch.yaml` by replacing `"--v=10"` with `"--v=0"`
71+
- description: >
72+
Add resource requests and limits to kube-rbac-proxy
73+
kind: "addition"
74+
# Is this a breaking change?
75+
breaking: false
76+
# Migration can be defined to automatically add a section to
77+
# the migration guide. This is required for breaking changes.
78+
migration:
79+
header: Add resource requests and limits to kube-rbac-proxy
80+
body: |
81+
Update the file `config/default/manager_auth_proxy_patch.yaml` by adding:
82+
83+
```
84+
...
85+
resources:
86+
limits:
87+
cpu: 500m
88+
memory: 128Mi
89+
requests:
90+
cpu: 5m
91+
memory: 64Mi
92+
```
93+
94+

Diff for: ‎config/crd/bases/_.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1beta1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
controller-gen.kubebuilder.io/version: v0.3.0
8+
creationTimestamp: null
9+
spec:
10+
group: ""
11+
names:
12+
kind: ""
13+
plural: ""
14+
scope: ""
15+
status:
16+
acceptedNames:
17+
kind: ""
18+
plural: ""
19+
conditions: null
20+
storedVersions: null

0 commit comments

Comments
 (0)