File tree Expand file tree Collapse file tree 7 files changed +10
-10
lines changed Expand file tree Collapse file tree 7 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ ARCH ?= amd64
25
25
OS ?= $(shell uname -s | tr A-Z a-z)
26
26
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
27
27
export CONTROLLER_IMG ?= $(REGISTRY ) /$(IMAGE_NAME )
28
- TAG ?= main
28
+ TAG ?= dev
29
29
30
30
# Get cluster-api version and build ldflags
31
31
clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
@@ -172,7 +172,7 @@ endif
172
172
173
173
KIND_CONFIG ?= kind-cluster.yaml
174
174
CONTROL_CLUSTER_NAME ?= sveltos-management
175
- WORKLOAD_CLUSTER_NAME ?= sveltos-management -workload
175
+ WORKLOAD_CLUSTER_NAME ?= clusterapi -workload
176
176
TIMEOUT ?= 10m
177
177
KIND_CLUSTER_YAML ?= test/$(WORKLOAD_CLUSTER_NAME ) .yaml
178
178
NUM_NODES ?= 5
@@ -203,7 +203,7 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin
203
203
$(KUBECTL) apply -f $(KIND_CLUSTER_YAML)
204
204
205
205
@echo "wait for cluster to be provisioned"
206
- $(KUBECTL) wait cluster sveltos-management-workload -n default --for=jsonpath='{.status.phase}'=Provisioned --timeout=$(TIMEOUT)
206
+ $(KUBECTL) wait cluster $(WORKLOAD_CLUSTER_NAME) -n default --for=jsonpath='{.status.phase}'=Provisioned --timeout=$(TIMEOUT)
207
207
208
208
@echo "prepare configMap with kustomize files"
209
209
$(KUBECTL) create configmap kustomize --from-file=test/kustomize.tar.gz
Original file line number Diff line number Diff line change 8
8
spec :
9
9
containers :
10
10
# Change the value of image field below to your controller image URL
11
- - image : projectsveltos/addon-controller-amd64:main
11
+ - image : projectsveltos/addon-controller-amd64:dev
12
12
name : controller
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ require (
17
17
github.com/onsi/ginkgo/v2 v2.11.0
18
18
github.com/onsi/gomega v1.27.8
19
19
github.com/pkg/errors v0.9.1
20
- github.com/projectsveltos/libsveltos v0.13.1-0.20230710120721-2074a30e9c99
20
+ github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a
21
21
github.com/prometheus/client_golang v1.16.0
22
22
github.com/spf13/pflag v1.0.5
23
23
github.com/yuin/gopher-lua v1.1.0
Original file line number Diff line number Diff line change @@ -557,8 +557,8 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
557
557
github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8 /go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU =
558
558
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY =
559
559
github.com/poy/onpar v1.1.2 /go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg =
560
- github.com/projectsveltos/libsveltos v0.13.1-0.20230710120721-2074a30e9c99 h1:4uljQXy5TKPNgaCybDhcOca2xUlmQ4hNmAgQUg4jeQs =
561
- github.com/projectsveltos/libsveltos v0.13.1-0.20230710120721-2074a30e9c99 /go.mod h1:Ty+xhEY1F6dWfMTG36izU6XFtzWVBOwzOc41OekkIWg =
560
+ github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a h1:0LXghU3MN1rg/s6k90a4HXjcxEu5emorM2M5UJUCZYQ =
561
+ github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a /go.mod h1:Ty+xhEY1F6dWfMTG36izU6XFtzWVBOwzOc41OekkIWg =
562
562
github.com/prometheus/client_golang v0.9.1 /go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw =
563
563
github.com/prometheus/client_golang v0.9.3 /go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso =
564
564
github.com/prometheus/client_golang v1.0.0 /go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo =
Original file line number Diff line number Diff line change @@ -1843,7 +1843,7 @@ spec:
1843
1843
- --v=5
1844
1844
command :
1845
1845
- /manager
1846
- image : projectsveltos/addon-controller-amd64:main
1846
+ image : projectsveltos/addon-controller-amd64:dev
1847
1847
livenessProbe :
1848
1848
httpGet :
1849
1849
path : /healthz
Original file line number Diff line number Diff line change @@ -319,7 +319,7 @@ spec:
319
319
apiVersion : cluster.x-k8s.io/v1beta1
320
320
kind : Cluster
321
321
metadata :
322
- name : sveltos-management -workload
322
+ name : clusterapi -workload
323
323
namespace : default
324
324
spec :
325
325
clusterNetwork :
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ var _ = BeforeSuite(func() {
100
100
clusterList := & clusterv1.ClusterList {}
101
101
listOptions := []client.ListOption {
102
102
client .MatchingLabels (
103
- map [string ]string {clusterv1 .ClusterNameLabel : "sveltos-management -workload" },
103
+ map [string ]string {clusterv1 .ClusterNameLabel : "clusterapi -workload" },
104
104
),
105
105
}
106
106
You can’t perform that action at this time.
0 commit comments