Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ OS ?= $(shell uname -s)
OS := $(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v1.2.0-beta.0
TAG ?= v1.2.0

.PHONY: all
all: build
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- "--v=5"
- "--version=v1.2.0-beta.0"
- "--version=v1.2.0"
- "--agent-in-mgmt-cluster=false"
env:
- name: GOMEMLIMIT
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: docker.io/projectsveltos/addon-controller:v1.2.0-beta.0
- image: docker.io/projectsveltos/addon-controller:v1.2.0
name: controller
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/dariubs/percent v1.0.0
github.com/docker/cli v28.5.1+incompatible
github.com/fluxcd/pkg/apis/meta v1.22.0
github.com/fluxcd/pkg/http/fetch v0.20.0
github.com/fluxcd/pkg/tar v0.15.0
github.com/fluxcd/source-controller/api v1.7.2
Expand All @@ -17,7 +18,7 @@ require (
github.com/onsi/ginkgo/v2 v2.26.0
github.com/onsi/gomega v1.38.2
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v1.2.0-beta.0
github.com/projectsveltos/libsveltos v1.2.0
github.com/prometheus/client_golang v1.23.2
github.com/robfig/cron v1.2.0
github.com/spf13/pflag v1.0.10
Expand Down Expand Up @@ -69,7 +70,6 @@ require (
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
github.com/fluxcd/pkg/apis/meta v1.22.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/projectsveltos/libsveltos v1.2.0-beta.0 h1:qqANKPEi8XUMfOnUMyHkY0Y3YXE9O4hjLrjU5GciOyI=
github.com/projectsveltos/libsveltos v1.2.0-beta.0/go.mod h1:n3s5Q0dSBANh26diRW3gcUafPD3iaFP3MRcD656Eo+U=
github.com/projectsveltos/libsveltos v1.2.0 h1:4EhpT+y11tbgKk4RPd88q9uHVKAB4hnuWtXTYI+72uM=
github.com/projectsveltos/libsveltos v1.2.0/go.mod h1:n3s5Q0dSBANh26diRW3gcUafPD3iaFP3MRcD656Eo+U=
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250809120506-2b7d4265df58 h1:h1xoUXs0Nihiwlrb4Trj7jpJdHPlEkOoE1L+zBRtJzI=
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250809120506-2b7d4265df58/go.mod h1:E2pgfDai5qVzcXqApq0stJEotw0gON5ibpf6XyRv3qM=
github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20250809120506-2b7d4265df58 h1:lpEHCcOZj9OkYhlTgvEemzTQ++VJmdEm8ts3WLsfgZM=
Expand Down
4 changes: 2 additions & 2 deletions manifest/deployment-agentless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- --v=5
- --version=v1.2.0-beta.0
- --version=v1.2.0
- --agent-in-mgmt-cluster=true
command:
- /manager
Expand All @@ -37,7 +37,7 @@ spec:
valueFrom:
resourceFieldRef:
resource: limits.cpu
image: docker.io/projectsveltos/addon-controller:v1.2.0-beta.0
image: docker.io/projectsveltos/addon-controller:v1.2.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions manifest/deployment-shard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- --shard-key={{.SHARD}}
- --capi-onboard-annotation=
- --v=5
- --version=v1.2.0-beta.0
- --version=v1.2.0
- --agent-in-mgmt-cluster=false
command:
- /manager
Expand All @@ -37,7 +37,7 @@ spec:
valueFrom:
resourceFieldRef:
resource: limits.cpu
image: docker.io/projectsveltos/addon-controller:v1.2.0-beta.0
image: docker.io/projectsveltos/addon-controller:v1.2.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6822,7 +6822,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- --v=5
- --version=v1.2.0-beta.0
- --version=v1.2.0
- --agent-in-mgmt-cluster=false
command:
- /manager
Expand All @@ -6835,7 +6835,7 @@ spec:
valueFrom:
resourceFieldRef:
resource: limits.cpu
image: docker.io/projectsveltos/addon-controller:v1.2.0-beta.0
image: docker.io/projectsveltos/addon-controller:v1.2.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ spec:
- --cluster-type=
- --current-cluster=management-cluster
- --run-mode=do-not-send-updates
- --version=v1.2.0-beta.0
- --version=v1.2.0
command:
- /manager
image: docker.io/projectsveltos/drift-detection-manager@sha256:7094d8f4cb4ff9ea8548469f980313eb873b7ef72436cf5d8c11b89369455e44
image: docker.io/projectsveltos/drift-detection-manager@sha256:2ff8be493ca1ff7828968da8aab2f304da5cf88a222016b3c8ecb92d4a5f8f88
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ spec:
- --cluster-type=
- --current-cluster=management-cluster
- --run-mode=do-not-send-updates
- --version=v1.2.0-beta.0
- --version=v1.2.0
command:
- /manager
image: docker.io/projectsveltos/drift-detection-manager@sha256:7094d8f4cb4ff9ea8548469f980313eb873b7ef72436cf5d8c11b89369455e44
image: docker.io/projectsveltos/drift-detection-manager@sha256:2ff8be493ca1ff7828968da8aab2f304da5cf88a222016b3c8ecb92d4a5f8f88
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions pkg/drift-detection/drift-detection-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ spec:
- --cluster-type=
- --current-cluster=managed-cluster
- --run-mode=do-not-send-updates
- --version=v1.2.0-beta.0
- --version=v1.2.0
command:
- /manager
image: docker.io/projectsveltos/drift-detection-manager@sha256:7094d8f4cb4ff9ea8548469f980313eb873b7ef72436cf5d8c11b89369455e44
image: docker.io/projectsveltos/drift-detection-manager@sha256:2ff8be493ca1ff7828968da8aab2f304da5cf88a222016b3c8ecb92d4a5f8f88
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions pkg/drift-detection/drift-detection-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ spec:
- --cluster-type=
- --current-cluster=managed-cluster
- --run-mode=do-not-send-updates
- --version=v1.2.0-beta.0
- --version=v1.2.0
command:
- /manager
image: docker.io/projectsveltos/drift-detection-manager@sha256:7094d8f4cb4ff9ea8548469f980313eb873b7ef72436cf5d8c11b89369455e44
image: docker.io/projectsveltos/drift-detection-manager@sha256:2ff8be493ca1ff7828968da8aab2f304da5cf88a222016b3c8ecb92d4a5f8f88
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
10 changes: 9 additions & 1 deletion test/fv/promotion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,15 @@ envoy:
if err != nil {
return false
}
return len(clusterProfileList.Items) == 0
if len(clusterProfileList.Items) == 0 {
return true
}
for i := range clusterProfileList.Items {
if clusterProfileList.Items[i].DeletionTimestamp.IsZero() {
return false
}
}
return true
}, timeout, pollingInterval).Should(BeTrue())
})
})
2 changes: 1 addition & 1 deletion test/pullmode-sveltosapplier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/sveltos-applier@sha256:1b2060dbcf31106d386de812c80684de2d30dab89ec56de88db3e0915f33520e
image: docker.io/projectsveltos/sveltos-applier@sha256:e42404bcb3db4b0f472fe21f7dd19f3206f9f31481b0dddbfb28825e70af8861
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down