Skip to content

Commit 67b2f58

Browse files
gianlucam76gianlucam76
committed
Prepare dev to main merge
1 parent 669ddac commit 67b2f58

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎Makefile

Lines changed: 4 additions & 4 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 ?= v0.5.0
28+
TAG ?= main
2929

3030
# Get cluster-api version and build ldflags
3131
clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
@@ -244,16 +244,16 @@ deploy-projectsveltos: $(KUSTOMIZE)
244244
$(MAKE) load-image
245245

246246
@echo 'Install libsveltos CRDs'
247-
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/v0.5.0/config/crd/bases/lib.projectsveltos.io_debuggingconfigurations.yaml
248-
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/v0.5.0/config/crd/bases/lib.projectsveltos.io_sveltosclusters.yaml
247+
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/main/config/crd/bases/lib.projectsveltos.io_debuggingconfigurations.yaml
248+
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/main/config/crd/bases/lib.projectsveltos.io_sveltosclusters.yaml
249249

250250
# Install projectsveltos controller-manager components
251251
@echo 'Install projectsveltos controller-manager components'
252252
cd config/manager && ../../$(KUSTOMIZE) edit set image controller=${IMG}
253253
$(KUSTOMIZE) build config/default | $(ENVSUBST) | $(KUBECTL) apply -f-
254254

255255
# Install sveltoscluster-manager
256-
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/sveltoscluster-manager/v0.5.0/manifest/manifest.yaml
256+
$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/sveltoscluster-manager/main/manifest/manifest.yaml
257257

258258
@echo "Waiting for projectsveltos controller-manager to be available..."
259259
$(KUBECTL) wait --for=condition=Available deployment/fm-controller-manager -n projectsveltos --timeout=$(TIMEOUT)

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ Refer to [examples](./examples/) for more complex examples
6464

6565
To see the full demo, have a look at this [youtube video](https://youtu.be/Ai5Mr9haWKM)
6666

67-
## Contributing [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/projectsveltos/sveltos-manager/issues)
68-
:heart: Your contributions are always welcome!
69-
If you have questions, noticed any bug or want to get the latest project news, you can connect with us in the following ways:
70-
1. Open a bug/feature enhancement on github;
71-
2. Chat with us on the Slack in the [#projectsveltos](https://join.slack.com/t/projectsveltos/shared_invite/zt-1hraownbr-W8NTs6LTimxLPB8Erj8Q6Q) channel;
72-
3. Submit a pull request;
73-
4. [Contact Us](mailto:support@projectsveltos.io)
67+
## Contributing
68+
69+
❤️ Your contributions are always welcome! If you want to contribute, have questions, noticed any bug or want to get the latest project news, you can connect with us in the following ways:
70+
71+
1. Open a bug/feature enhancement on github [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/projectsveltos/sveltos-manager/issues)
72+
2. Chat with us on the Slack in the #projectsveltos channel [![Slack](https://img.shields.io/badge/join%20slack-%23projectsveltos-brighteen)](https://join.slack.com/t/projectsveltos/shared_invite/zt-1hraownbr-W8NTs6LTimxLPB8Erj8Q6Q)
73+
3. [Contact Us](mailto:support@projectsveltos.io)
7474

7575
## License
7676

‎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: gianlucam76/sveltos-manager-amd64:v0.5.0
11+
- image: gianlucam76/sveltos-manager-amd64:main
1212
name: manager

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/onsi/ginkgo/v2 v2.6.0
1313
github.com/onsi/gomega v1.24.1
1414
github.com/pkg/errors v0.9.1
15-
github.com/projectsveltos/libsveltos v0.5.0
15+
github.com/projectsveltos/libsveltos v0.5.1-0.20230217184152-736d1e4355e5
1616
github.com/prometheus/client_golang v1.13.0
1717
github.com/spf13/pflag v1.0.5
1818
golang.org/x/text v0.5.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
790790
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
791791
github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg=
792792
github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
793-
github.com/projectsveltos/libsveltos v0.5.0 h1:dhOC7xsaHAiowVHm0GFQKsG/yvS48Ahg0Y1W8rvFWa4=
794-
github.com/projectsveltos/libsveltos v0.5.0/go.mod h1:smYCt3DQSZpQqsaoM2mJAIP6RAMXcxw5Af0mzkncCs4=
793+
github.com/projectsveltos/libsveltos v0.5.1-0.20230217184152-736d1e4355e5 h1:aBvOqtUX9mnHs4RWC5f5Y6joHyxRZ5+p0w0EdDJL7Ts=
794+
github.com/projectsveltos/libsveltos v0.5.1-0.20230217184152-736d1e4355e5/go.mod h1:smYCt3DQSZpQqsaoM2mJAIP6RAMXcxw5Af0mzkncCs4=
795795
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
796796
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
797797
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

‎manifest/manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ spec:
13801380
- --v=5
13811381
command:
13821382
- /manager
1383-
image: gianlucam76/sveltos-manager-amd64:v0.5.0
1383+
image: gianlucam76/sveltos-manager-amd64:main
13841384
livenessProbe:
13851385
httpGet:
13861386
path: /healthz

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ spec:
260260
- --run-mode=do-not-send-updates
261261
command:
262262
- /manager
263-
image: gianlucam76/drift-detection-manager-amd64:v0.5.0
263+
image: gianlucam76/drift-detection-manager-amd64:main
264264
livenessProbe:
265265
httpGet:
266266
path: /healthz

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ spec:
242242
- --run-mode=do-not-send-updates
243243
command:
244244
- /manager
245-
image: gianlucam76/drift-detection-manager-amd64:v0.5.0
245+
image: gianlucam76/drift-detection-manager-amd64:main
246246
livenessProbe:
247247
httpGet:
248248
path: /healthz

0 commit comments

Comments
 (0)