Skip to content

Commit eef139f

Browse files
authored
Merge pull request #467 from gianlucam76/prep
(chore) prepare for release v1.9.0
2 parents e9d7488 + 1d76ad0 commit eef139f

23 files changed

Lines changed: 202 additions & 176 deletions

.github/workflows/main.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2020
with:
21-
go-version: 1.26.1
21+
go-version: 1.26.2
2222
- name: Build
2323
run: make build
2424
- name: FMT
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set up Go
3838
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3939
with:
40-
go-version: 1.26.1
40+
go-version: 1.26.2
4141
- name: ut
4242
run: make test
4343
env:
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up Go
5151
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5252
with:
53-
go-version: 1.26.1
53+
go-version: 1.26.2
5454
- name: fv
5555
run: make create-cluster fv
5656
env:
@@ -63,7 +63,7 @@ jobs:
6363
- name: Set up Go
6464
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
6565
with:
66-
go-version: 1.26.1
66+
go-version: 1.26.2
6767
- name: fv-sharding
6868
run: make create-cluster fv-sharding
6969
env:
@@ -76,7 +76,7 @@ jobs:
7676
- name: Set up Go
7777
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
7878
with:
79-
go-version: 1.26.1
79+
go-version: 1.26.2
8080
- name: fv-agentless
8181
run: make create-cluster fv-agentless
8282
env:
@@ -89,7 +89,7 @@ jobs:
8989
- name: Set up Go
9090
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
9191
with:
92-
go-version: 1.26.1
92+
go-version: 1.26.2
9393
- name: fv-pullmode
9494
run: make create-cluster-pullmode fv-pullmode
9595
env:

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.26.1 AS builder
2+
FROM golang:1.26.2 AS builder
33

44
ARG BUILDOS
55
ARG TARGETARCH

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ARCH ?= $(shell go env GOARCH)
4545
OS ?= $(shell uname -s | tr A-Z a-z)
4646
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
4747
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
48-
TAG ?= main
48+
TAG ?= v1.9.0
4949

5050
## Tool Binaries
5151
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
@@ -59,7 +59,7 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
5959
CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
6060

6161
GOLANGCI_LINT_VERSION := "v2.11.4"
62-
CLUSTERCTL_VERSION := v1.12.5
62+
CLUSTERCTL_VERSION := v1.13.1
6363

6464
KUSTOMIZE_VER := v5.8.0
6565
KUSTOMIZE_BIN := kustomize

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Classifier currently supports the following classification criteria:
1616
1. Kubernetes version
1717
2. Kubernetes resources
1818

19-
For instance, this Classifier instance will match any cluster whose Kubernetes version is greater than or equal to "v1.24.0" and strictly less than "v1.26.1"
19+
For instance, this Classifier instance will match any cluster whose Kubernetes version is greater than or equal to "v1.24.0" and strictly less than "v1.26.2"
2020

2121
```
2222
apiVersion: lib.projectsveltos.io/v1beta1
@@ -31,7 +31,7 @@ spec:
3131
- comparison: GreaterThanOrEqualTo
3232
version: 1.24.0
3333
- comparison: LessThan
34-
version: 1.26.1
34+
version: 1.26.2
3535
```
3636

3737
When a cluster is a match for a Classifier instances, all classifierLabels will be automatically added to the Cluster instance.
@@ -45,8 +45,8 @@ Refer to [examples](./examples/) for more complex examples.
4545
## A simple use case: upgrade helm charts automatically when Kubernetes cluster is upgraded
4646
Suppose you are managing several Kubernetes clusters with different versions.
4747
And you want to deploy:
48-
1. OPA Gatekeeper version 3.10.0 in any Kubernetes cluster whose version is >= v1.26.1
49-
2. OPA Gatekeeper version 3.9.0 in any Kubernetes cluster whose version is >= v1.24.0 && < v1.26.1
48+
1. OPA Gatekeeper version 3.10.0 in any Kubernetes cluster whose version is >= v1.26.2
49+
2. OPA Gatekeeper version 3.9.0 in any Kubernetes cluster whose version is >= v1.24.0 && < v1.26.2
5050

5151
You can create following ClusterProfiles and Classifiers in the management cluster:
5252
```
@@ -102,7 +102,7 @@ spec:
102102
value: v3-10
103103
kubernetesVersionConstraints:
104104
- comparison: GreaterThanOrEqualTo
105-
version: 1.26.1
105+
version: 1.26.2
106106
```
107107

108108
```
@@ -118,7 +118,7 @@ spec:
118118
- comparison: GreaterThanOrEqualTo
119119
version: 1.24.0
120120
- comparison: LessThan
121-
version: 1.26.1
121+
version: 1.26.2
122122
```
123123

124124
With the above configuration:

config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ spec:
1616
- "--shard-key="
1717
- --capi-onboard-annotation=
1818
- "--v=5"
19-
- "--version=main"
19+
- "--version=v1.9.0"
2020
- "--registry="
2121
- "--agent-in-mgmt-cluster=false"

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: docker.io/projectsveltos/classifier:main
11+
- image: docker.io/projectsveltos/classifier:v1.9.0
1212
name: manager

controllers/controllers_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ func getClassifierReport(classifierName, clusterNamespace, clusterName string) *
185185
}
186186

187187
func getClassifierInstance(name string) *libsveltosv1beta1.Classifier {
188-
classifierLabels := []libsveltosv1beta1.ClassifierLabel{{Key: "version", Value: "v1.26.1"}}
188+
classifierLabels := []libsveltosv1beta1.ClassifierLabel{{Key: "version", Value: "v1.26.2"}}
189189
return &libsveltosv1beta1.Classifier{
190190
ObjectMeta: metav1.ObjectMeta{
191191
Name: name,
192192
},
193193
Spec: libsveltosv1beta1.ClassifierSpec{
194194
KubernetesVersionConstraints: []libsveltosv1beta1.KubernetesVersionConstraint{
195195
{
196-
Version: "1.26.1",
196+
Version: "1.26.2",
197197
Comparison: string(libsveltosv1beta1.ComparisonEqual),
198198
},
199199
},

examples/kubernetes_version.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Following Classifier will match any Cluster whose
2-
# Kubernetes version is >= v1.24.0 and < v1.26.1
2+
# Kubernetes version is >= v1.24.0 and < v1.26.2
33
apiVersion: lib.projectsveltos.io/v1beta1
44
kind: Classifier
55
metadata:
@@ -12,4 +12,4 @@ spec:
1212
- comparison: GreaterThanOrEqualTo
1313
version: 1.24.0
1414
- comparison: LessThan
15-
version: 1.26.1
15+
version: 1.26.2

examples/multiple_constraints.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Following Classifier will match any Cluster whose
2-
# Kubernetes version is >= v1.24.0 and < v1.26.1
2+
# Kubernetes version is >= v1.24.0 and < v1.26.2
33
apiVersion: lib.projectsveltos.io/v1beta1
44
kind: Classifier
55
metadata:
@@ -10,7 +10,7 @@ spec:
1010
value: multiple
1111
kubernetesVersionConstraints:
1212
- comparison: GreaterThanOrEqualTo
13-
version: 1.26.1
13+
version: 1.26.2
1414
deployedResourceConstraint:
1515
- group: ""
1616
version: v1

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/projectsveltos/classifier
22

3-
go 1.26.1
3+
go 1.26.2
44

55
require (
66
github.com/TwiN/go-color v1.4.1
@@ -9,7 +9,7 @@ require (
99
github.com/onsi/ginkgo/v2 v2.28.3
1010
github.com/onsi/gomega v1.40.0
1111
github.com/pkg/errors v0.9.1
12-
github.com/projectsveltos/libsveltos v1.8.1-0.20260504084132-12f98fc4a775
12+
github.com/projectsveltos/libsveltos v1.9.0
1313
github.com/prometheus/client_golang v1.23.2
1414
github.com/spf13/pflag v1.0.10
1515
golang.org/x/text v0.36.0

0 commit comments

Comments
 (0)