Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: dump controller-gen version #1066

Merged
merged 1 commit into from
Sep 2, 2024
Merged

chore: dump controller-gen version #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- name: install kubebuilder
run: |
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- name: Deploy operator
timeout-minutes: 5
uses: ./.github/actions/deploy-operator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- name: Build image
env:
IMG: "emqx/emqx-operator-controller:${{ github.sha }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- uses: golangci/golangci-lint-action@v4
with:
##https://github.com/golangci/golangci-lint-action/issues/807
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
- name: Install Telepresence
env:
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- run: make test
- uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version-file: 'go.mod'
- name: Get pre stable version
## Just get the last stable version, ignore the pre-release version
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.21 as builder
FROM golang:1.22 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ TELEPRESENCE_GEN ?= $(LOCALBIN)/telepresence

## Tool Versions
KUSTOMIZE_VERSION ?= v4
CONTROLLER_TOOLS_VERSION ?= v0.9.2
CONTROLLER_TOOLS_VERSION ?= latest
ENVTEST_VERSION ?= latest
CRD_REF_DOCS_VERSION ?= latest

Expand Down
1 change: 0 additions & 1 deletion apis/apps/v1beta3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/apps/v1beta4/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/apps/v2alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/apps/v2beta1/emqx_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

// +kubebuilder:object:root=true
// +kubebuilder:resource:shortName=emqx
// +kubebuilder:resource:shortName=emqx,path=emqxes
// +kubebuilder:storageversion
// +kubebuilder:subresource:status
// +kubebuilder:subresource:scale:specpath=.spec.replicantTemplate.spec.replicas,statuspath=.status.replicantNodeReplicas
Expand Down
1 change: 0 additions & 1 deletion apis/apps/v2beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 26 additions & 2 deletions config/crd/bases/apps.emqx.io_emqxbrokers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.16.2
name: emqxbrokers.apps.emqx.io
spec:
group: apps.emqx.io
Expand Down Expand Up @@ -1244,6 +1243,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1334,6 +1334,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1620,6 +1621,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1683,6 +1685,8 @@ spec:
username:
default: admin
type: string
required:
- image
type: object
env:
items:
Expand Down Expand Up @@ -1987,6 +1991,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2091,6 +2096,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2276,6 +2282,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2631,6 +2638,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2735,6 +2743,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2920,6 +2929,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -4003,6 +4013,8 @@ spec:
type: string
version:
type: string
required:
- version
type: object
lifecycle:
properties:
Expand Down Expand Up @@ -4141,6 +4153,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -4243,6 +4256,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -4417,6 +4431,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -4761,6 +4776,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -4865,6 +4881,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -5050,6 +5067,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -5399,6 +5417,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -5503,6 +5522,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -5688,6 +5708,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -6043,6 +6064,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -6147,6 +6169,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -6332,6 +6355,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down
Loading