Skip to content

Commit a1212b6

Browse files
committed
Bump controller-gen and Go versions.
1 parent 862aeab commit a1212b6

4 files changed

Lines changed: 9 additions & 28 deletions

File tree

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: "1.23"
22+
go-version: "1.25"
2323

2424
- name: Build
2525
run: go build -v ./...

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.31.0
5+
ENVTEST_K8S_VERSION = 1.33.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -144,7 +144,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
144144

145145
## Tool Versions
146146
KUSTOMIZE_VERSION ?= v3.8.7
147-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
147+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
148148

149149
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
150150
.PHONY: kustomize

config/crd/bases/flux.gitops.pro_kustomizationautodeployers.yaml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: kustomizationautodeployers.flux.gitops.pro
88
spec:
99
group: flux.gitops.pro
@@ -46,7 +46,6 @@ spec:
4646
description: |-
4747
CloneDepth limits the number of commits to get from the GitRepository.
4848
49-
5049
This is an optimisation for fetching commits.
5150
maximum: 100
5251
minimum: 5
@@ -86,9 +85,7 @@ spec:
8685
description: hh:mm for the time to "close" the gate at.
8786
type: string
8887
open:
89-
description: |-
90-
TODO: These need validation!
91-
hh:mm for the time to "open" the gate at.
88+
description: hh:mm for the time to "open" the gate at.
9289
type: string
9390
required:
9491
- close
@@ -107,7 +104,6 @@ spec:
107104
The Kustomization resource to track and wait for new commits to be
108105
available.
109106
110-
111107
This will access the GitRepository that is used by the Kustomization.
112108
properties:
113109
name:
@@ -127,16 +123,8 @@ spec:
127123
conditions:
128124
description: Conditions holds the conditions for the KustomizationAutoDeployer.
129125
items:
130-
description: "Condition contains details for one aspect of the current
131-
state of this API Resource.\n---\nThis struct is intended for
132-
direct use as an array at the field path .status.conditions. For
133-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
134-
observations of a foo's current state.\n\t // Known .status.conditions.type
135-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
136-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
137-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
138-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
139-
\ // other fields\n\t}"
126+
description: Condition contains details for one aspect of the current
127+
state of this API Resource.
140128
properties:
141129
lastTransitionTime:
142130
description: |-
@@ -177,12 +165,7 @@ spec:
177165
- Unknown
178166
type: string
179167
type:
180-
description: |-
181-
type of condition in CamelCase or in foo.example.com/CamelCase.
182-
---
183-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
184-
useful (see .node.status.conditions), the ability to deconflict is important.
185-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
168+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
186169
maxLength: 316
187170
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
188171
type: string

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/gitops-tools/kustomization-auto-deployer
22

3-
go 1.24.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
require (
86
github.com/fluxcd/kustomize-controller/api v1.6.1

0 commit comments

Comments
 (0)