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 @@ -34,7 +34,7 @@ OS ?= $(shell uname -s)
OS := $(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
K8S_LATEST_VER ?= $(shell curl -s https://dl.k8s.io/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= main
TAG ?= v1.14.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 @@ -35,7 +35,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- "--v=5"
- "--version=main"
- "--version=v1.14.0"
- "--agent-in-mgmt-cluster=false"
env:
- name: GOMEMLIMIT
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ spec:
template:
spec:
initContainers:
- image: docker.io/projectsveltos/addon-controller:main
- image: docker.io/projectsveltos/addon-controller:v1.14.0
name: initialization
containers:
- image: docker.io/projectsveltos/addon-controller:main
- image: docker.io/projectsveltos/addon-controller:v1.14.0
name: controller
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/onsi/gomega v1.42.1
github.com/opencontainers/image-spec v1.1.1
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v1.13.1-0.20260817131031-65ba770060a8
github.com/projectsveltos/libsveltos v1.14.0
github.com/prometheus/client_golang v1.24.1
github.com/sigstore/cosign/v3 v3.1.3
github.com/sigstore/sigstore v1.10.9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
github.com/projectsveltos/libsveltos v1.13.1-0.20260817131031-65ba770060a8 h1:F4EvbmX0vecFGX01iZOeMRPGvvvw9A1kh+tg4BVQU70=
github.com/projectsveltos/libsveltos v1.13.1-0.20260817131031-65ba770060a8/go.mod h1:U6iGj5KoC/PcTD2vh3XU6gy7g11suThT6sZSEpmLEkU=
github.com/projectsveltos/libsveltos v1.14.0 h1:vw+kbGfsMcKk69AdQsjpdhlZK0LI/07Y+292noB9F+8=
github.com/projectsveltos/libsveltos v1.14.0/go.mod h1:U6iGj5KoC/PcTD2vh3XU6gy7g11suThT6sZSEpmLEkU=
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20251212200258-2b3cdcb7c0f5 h1:khnc+994UszxZYu69J+R5FKiLA/Nk1JQj0EYAkwTWz0=
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20251212200258-2b3cdcb7c0f5/go.mod h1:yVL8KQFa9tmcxgwl9nwIMtKgtmIVC1zaFRSCfOwYvPY=
github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20251212200258-2b3cdcb7c0f5 h1:YbsebwRwTRhV8QacvEAdFqxcxHdeu7JTVtsBovbkgos=
Expand Down
6 changes: 3 additions & 3 deletions manifest/deployment-agentless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- --v=5
- --version=main
- --version=v1.14.0
- --agent-in-mgmt-cluster=true
command:
- /manager
Expand All @@ -43,7 +43,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -101,7 +101,7 @@ spec:
fieldPath: metadata.namespace
- name: IS_INITIALIZATION
value: "true"
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
name: initialization
securityContext:
allowPrivilegeEscalation: false
Expand Down
6 changes: 3 additions & 3 deletions manifest/deployment-shard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- --shard-key={{.SHARD}}
- --capi-onboard-annotation=
- --v=5
- --version=main
- --version=v1.14.0
- --agent-in-mgmt-cluster=false
command:
- /manager
Expand All @@ -43,7 +43,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -101,7 +101,7 @@ spec:
fieldPath: metadata.namespace
- name: IS_INITIALIZATION
value: "true"
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
name: initialization
securityContext:
allowPrivilegeEscalation: false
Expand Down
6 changes: 3 additions & 3 deletions manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11987,7 +11987,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- --v=5
- --version=main
- --version=v1.14.0
- --agent-in-mgmt-cluster=false
command:
- /manager
Expand All @@ -12004,7 +12004,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -12062,7 +12062,7 @@ spec:
fieldPath: metadata.namespace
- name: IS_INITIALIZATION
value: "true"
image: docker.io/projectsveltos/addon-controller:main
image: docker.io/projectsveltos/addon-controller:v1.14.0
name: initialization
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
- --cluster-type=
- --current-cluster=management-cluster
- --run-mode=do-not-send-updates
- --version=main
- --version=v1.14.0
command:
- /manager
env:
Expand All @@ -60,7 +60,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/drift-detection-manager@sha256:0a1316308e9968a20d622520b7ac4cbfd8ad6defc5574ef3329bd7f85877fe68
image: docker.io/projectsveltos/drift-detection-manager@sha256:485cb5d78fc701347d06539302eda642694902acebab268cd528eaf59424c0d3
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- --cluster-type=
- --current-cluster=management-cluster
- --run-mode=do-not-send-updates
- --version=main
- --version=v1.14.0
command:
- /manager
env:
Expand All @@ -42,7 +42,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/drift-detection-manager@sha256:0a1316308e9968a20d622520b7ac4cbfd8ad6defc5574ef3329bd7f85877fe68
image: docker.io/projectsveltos/drift-detection-manager@sha256:485cb5d78fc701347d06539302eda642694902acebab268cd528eaf59424c0d3
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,7 +146,7 @@ spec:
- --cluster-type=
- --current-cluster=managed-cluster
- --run-mode=do-not-send-updates
- --version=main
- --version=v1.14.0
command:
- /manager
env:
Expand All @@ -162,7 +162,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/drift-detection-manager@sha256:0a1316308e9968a20d622520b7ac4cbfd8ad6defc5574ef3329bd7f85877fe68
image: docker.io/projectsveltos/drift-detection-manager@sha256:485cb5d78fc701347d06539302eda642694902acebab268cd528eaf59424c0d3
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,7 +128,7 @@ spec:
- --cluster-type=
- --current-cluster=managed-cluster
- --run-mode=do-not-send-updates
- --version=main
- --version=v1.14.0
command:
- /manager
env:
Expand All @@ -144,7 +144,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/projectsveltos/drift-detection-manager@sha256:0a1316308e9968a20d622520b7ac4cbfd8ad6defc5574ef3329bd7f85877fe68
image: docker.io/projectsveltos/drift-detection-manager@sha256:485cb5d78fc701347d06539302eda642694902acebab268cd528eaf59424c0d3
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
7 changes: 5 additions & 2 deletions test/fv/mgmt_cluster_local_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ var _ = Describe("ClusterProfile matching the management cluster with deployment

Byf("Verifying ConfigMap my-test-%s is present in namespace %s of the management cluster",
mgmt, configMapNamespace)
Eventually(func() error {
Consistently(func() error {
cm := &corev1.ConfigMap{}
return k8sClient.Get(context.TODO(),
types.NamespacedName{Namespace: configMapNamespace, Name: "my-test-" + mgmt}, cm)
}, timeout, pollingInterval).Should(BeNil())
}, timeout/2, pollingInterval).Should(BeNil())

deleteClusterProfile(clusterProfile)

Expand All @@ -152,6 +152,9 @@ var _ = Describe("ClusterProfile matching the management cluster with deployment
cm := &corev1.ConfigMap{}
err := k8sClient.Get(context.TODO(),
types.NamespacedName{Namespace: configMapNamespace, Name: "my-test-" + mgmt}, cm)
if err == nil {
return !cm.DeletionTimestamp.IsZero()
}
return err != nil && apierrors.IsNotFound(err)
}, timeout, pollingInterval).Should(BeTrue())
})
Expand Down
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:f51e4973b896cdedcfb6e50dc40516d7cab2dad9714eeca9730ded49421dfac5
image: docker.io/projectsveltos/sveltos-applier@sha256:56f3353f5d6b5d646628da1d5815b5692190a1279959dd23b8726e9efc155409
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down