Skip to content

Commit

Permalink
Merge pull request #306 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Sep 12, 2024
2 parents d0ae816 + 9fed49c commit a163b00
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ARCH ?= amd64
OS ?= $(shell uname -s | tr A-Z a-z)
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v0.38.1
TAG ?= main

GOLANGCI_LINT_VERSION := "v1.59.0"
CLUSTERCTL_VERSION := "v1.8.3"
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,6 +16,6 @@ spec:
- "--cluster-namespace="
- "--cluster-name="
- "--cluster-type="
- "--version=v0.38.1"
- "--version=main"
- "--current-cluster=managed-cluster"
- "--run-mode=do-not-send-reports"
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/sveltos-agent:v0.38.1
- image: docker.io/projectsveltos/sveltos-agent:main
name: manager
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.38.1
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea
github.com/spf13/pflag v1.0.5
github.com/yuin/gopher-lua v1.1.1
golang.org/x/text v0.18.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/libsveltos v0.38.1 h1:4kYeAAXQ7/r0h5CIpHiOn9MMDw9GvnLgquo5HF+1L4A=
github.com/projectsveltos/libsveltos v0.38.1/go.mod h1:FITu0ZxiB0lfPVfFkIKJ9rk/ZWDup1OTymiIX+uEXtw=
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea h1:Fnx5ln7D1/Ro6TOXjhSqQPwS+xrW+X3n4ipJxFkob+M=
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea/go.mod h1:FITu0ZxiB0lfPVfFkIKJ9rk/ZWDup1OTymiIX+uEXtw=
github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4=
github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
Expand Down
4 changes: 2 additions & 2 deletions manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ spec:
- --cluster-namespace=
- --cluster-name=
- --cluster-type=
- --version=v0.38.1
- --version=main
- --current-cluster=managed-cluster
- --run-mode=do-not-send-reports
command:
- /manager
image: docker.io/projectsveltos/sveltos-agent:v0.38.1
image: docker.io/projectsveltos/sveltos-agent:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions manifest/mgmt_cluster_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ spec:
- --cluster-namespace=
- --cluster-name=
- --cluster-type=
- --version=v0.38.1
- --version=main
- --current-cluster=management-cluster
- --run-mode=do-not-send-reports
command:
- /manager
image: docker.io/projectsveltos/sveltos-agent:v0.38.1
image: docker.io/projectsveltos/sveltos-agent:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down

0 comments on commit a163b00

Please sign in to comment.