Skip to content

Commit 058519d

Browse files
authored
Merge pull request #280 from gianlucam76/rename-cluster
Rename workload cluster
2 parents 0c5cd92 + f382f20 commit 058519d

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARCH ?= amd64
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 ?= main
28+
TAG ?= dev
2929

3030
# Get cluster-api version and build ldflags
3131
clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
@@ -172,7 +172,7 @@ endif
172172

173173
KIND_CONFIG ?= kind-cluster.yaml
174174
CONTROL_CLUSTER_NAME ?= sveltos-management
175-
WORKLOAD_CLUSTER_NAME ?= sveltos-management-workload
175+
WORKLOAD_CLUSTER_NAME ?= clusterapi-workload
176176
TIMEOUT ?= 10m
177177
KIND_CLUSTER_YAML ?= test/$(WORKLOAD_CLUSTER_NAME).yaml
178178
NUM_NODES ?= 5
@@ -203,7 +203,7 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin
203203
$(KUBECTL) apply -f $(KIND_CLUSTER_YAML)
204204

205205
@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)
207207

208208
@echo "prepare configMap with kustomize files"
209209
$(KUBECTL) create configmap kustomize --from-file=test/kustomize.tar.gz

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: projectsveltos/addon-controller-amd64:main
11+
- image: projectsveltos/addon-controller-amd64:dev
1212
name: controller

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/onsi/ginkgo/v2 v2.11.0
1818
github.com/onsi/gomega v1.27.8
1919
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
2121
github.com/prometheus/client_golang v1.16.0
2222
github.com/spf13/pflag v1.0.5
2323
github.com/yuin/gopher-lua v1.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
557557
github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
558558
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
559559
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=
562562
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
563563
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
564564
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=

manifest/manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,7 @@ spec:
18431843
- --v=5
18441844
command:
18451845
- /manager
1846-
image: projectsveltos/addon-controller-amd64:main
1846+
image: projectsveltos/addon-controller-amd64:dev
18471847
livenessProbe:
18481848
httpGet:
18491849
path: /healthz

test/sveltos-management-workload.yaml renamed to test/clusterapi-workload.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ spec:
319319
apiVersion: cluster.x-k8s.io/v1beta1
320320
kind: Cluster
321321
metadata:
322-
name: sveltos-management-workload
322+
name: clusterapi-workload
323323
namespace: default
324324
spec:
325325
clusterNetwork:

test/fv/fv_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ var _ = BeforeSuite(func() {
100100
clusterList := &clusterv1.ClusterList{}
101101
listOptions := []client.ListOption{
102102
client.MatchingLabels(
103-
map[string]string{clusterv1.ClusterNameLabel: "sveltos-management-workload"},
103+
map[string]string{clusterv1.ClusterNameLabel: "clusterapi-workload"},
104104
),
105105
}
106106

0 commit comments

Comments
 (0)