Skip to content

Commit 340fe74

Browse files
authored
Merge pull request #8 from jmhbnz/main
Update to go 1.23
2 parents df5acd2 + 06fca71 commit 340fe74

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "golang:1.22",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
6-
"ghcr.io/devcontainers/features/git:1": {}
6+
"ghcr.io/devcontainers/features/git:1": {},
7+
"ghcr.io/devcontainers/features/github-cli:1": {},
8+
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
79
},
810

911
"runArgs": ["--network=host"],
@@ -22,4 +24,3 @@
2224

2325
"onCreateCommand": "bash .devcontainer/post-install.sh"
2426
}
25-

.devcontainer/post-install.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@ set -x
33

44
curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
55
chmod +x ./kind
6-
mv ./kind /usr/local/bin/kind
6+
sudo mv ./kind /usr/local/bin/kind
77

88
curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/linux/amd64
99
chmod +x kubebuilder
10-
mv kubebuilder /usr/local/bin/
11-
12-
KUBECTL_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
13-
curl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl"
14-
chmod +x kubectl
15-
mv kubectl /usr/local/bin/kubectl
10+
sudo mv kubebuilder /usr/local/bin/
1611

1712
docker network create -d=bridge --subnet=172.19.0.0/24 kind
1813

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: '~1.22'
18+
go-version-file: 'go.mod'
1919

2020
- name: Install the latest version of kind
2121
run: |

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: '~1.22'
18+
go-version-file: 'go.mod'
1919

2020
- name: Running Tests
2121
run: |

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 AS builder
2+
FROM golang:1.23 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of
1919
## Getting Started
2020

2121
### Prerequisites
22-
- go version v1.22.0+
22+
23+
- go version v1.23.0+
2324
- docker version 17.03+.
2425
- kubectl version v1.11.3+.
2526
- Access to a Kubernetes v1.11.3+ cluster.
2627

2728
### To Deploy on the cluster
29+
2830
**Build and push your image to the location specified by `IMG`:**
2931

3032
```sh
@@ -60,6 +62,7 @@ kubectl apply -k config/samples/
6062
>**NOTE**: Ensure that the samples has default values to test it out.
6163
6264
### To Uninstall
65+
6366
**Delete the instances (CRs) from the cluster:**
6467

6568
```sh
@@ -102,6 +105,7 @@ kubectl apply -f https://raw.githubusercontent.com/<org>/etcd-operator/<tag or b
102105
```
103106

104107
## Contributing
108+
105109
// TODO(user): Add detailed information on how you would like others to contribute to this project
106110

107111
**NOTE:** Run `make help` for more information on all potential `make` targets

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module go.etcd.io/etcd-operator
22

3-
go 1.22.0
3+
toolchain go1.23.4
4+
5+
go 1.23
46

57
require (
68
github.com/onsi/ginkgo/v2 v2.19.0

0 commit comments

Comments
 (0)