Skip to content

Commit 9dfcbfc

Browse files
authored
Merge pull request #650 from gianlucam76/prep
Prepare for dev to main merge
2 parents 1038a75 + 22cf9f2 commit 9dfcbfc

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARCH ?= $(shell go env GOARCH)
2525
OS ?= $(shell uname -s | tr A-Z a-z)
2626
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
2727
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
28-
TAG ?= v0.35.0
28+
TAG ?= main
2929

3030
.PHONY: all
3131
all: build

config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ spec:
1515
- "--report-mode=0"
1616
- --shard-key=
1717
- "--v=5"
18-
- "--version=v0.35.0"
18+
- "--version=main"

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/addon-controller:v0.35.0
11+
- image: docker.io/projectsveltos/addon-controller:main
1212
name: controller

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/onsi/ginkgo/v2 v2.19.0
1616
github.com/onsi/gomega v1.33.1
1717
github.com/pkg/errors v0.9.1
18-
github.com/projectsveltos/libsveltos v0.35.0
18+
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2
1919
github.com/prometheus/client_golang v1.19.1
2020
github.com/spf13/pflag v1.0.5
2121
github.com/yuin/gopher-lua v1.1.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
364364
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
365365
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
366366
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
367-
github.com/projectsveltos/libsveltos v0.35.0 h1:pzMqPVvkfULgtyFuuPkt6l7Cfctua54ZzxnzoDAa4KQ=
368-
github.com/projectsveltos/libsveltos v0.35.0/go.mod h1:8cr9lSt8i0fRQ47AItTElqxsiD/ni80GJALVQgxfdG4=
367+
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2 h1:DE4fivtx4pjPFpjAyDWbG46RQQCyDMgJ7ZI/5zkHq88=
368+
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2/go.mod h1:8cr9lSt8i0fRQ47AItTElqxsiD/ni80GJALVQgxfdG4=
369369
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
370370
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
371371
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

manifest/deployment-agentless.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ spec:
2323
- --report-mode=0
2424
- --agent-in-mgmt-cluster
2525
- --v=5
26-
- --version=v0.35.0
26+
- --version=main
2727
command:
2828
- /manager
29-
image: docker.io/projectsveltos/addon-controller:v0.35.0
29+
image: docker.io/projectsveltos/addon-controller:main
3030
livenessProbe:
3131
failureThreshold: 3
3232
httpGet:

manifest/deployment-shard.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ spec:
2323
- --report-mode=0
2424
- --shard-key={{.SHARD}}
2525
- --v=5
26-
- --version=v0.35.0
26+
- --version=main
2727
command:
2828
- /manager
29-
image: docker.io/projectsveltos/addon-controller:v0.35.0
29+
image: docker.io/projectsveltos/addon-controller:main
3030
livenessProbe:
3131
failureThreshold: 3
3232
httpGet:

manifest/manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8405,10 +8405,10 @@ spec:
84058405
- --report-mode=0
84068406
- --shard-key=
84078407
- --v=5
8408-
- --version=v0.35.0
8408+
- --version=main
84098409
command:
84108410
- /manager
8411-
image: docker.io/projectsveltos/addon-controller:v0.35.0
8411+
image: docker.io/projectsveltos/addon-controller:main
84128412
livenessProbe:
84138413
failureThreshold: 3
84148414
httpGet:

pkg/drift-detection/drift-detection-manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
- --run-mode=do-not-send-updates
131131
command:
132132
- /manager
133-
image: docker.io/projectsveltos/drift-detection-manager:v0.35.0
133+
image: docker.io/projectsveltos/drift-detection-manager:main
134134
livenessProbe:
135135
failureThreshold: 3
136136
httpGet:

pkg/drift-detection/drift-detection-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ spec:
112112
- --run-mode=do-not-send-updates
113113
command:
114114
- /manager
115-
image: docker.io/projectsveltos/drift-detection-manager:v0.35.0
115+
image: docker.io/projectsveltos/drift-detection-manager:main
116116
livenessProbe:
117117
failureThreshold: 3
118118
httpGet:

0 commit comments

Comments
 (0)