Skip to content
This repository has been archived by the owner on Jan 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #75 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Jan 4, 2024
2 parents fb78b4e + 61efe88 commit b8bef86
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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.21.0
TAG ?= main

.PHONY: all
all: build
Expand Down
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: projectsveltos/addon-compliance-controller-amd64:v0.21.0
- image: projectsveltos/addon-compliance-controller-amd64:main
name: manager
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.21.0
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445
github.com/spf13/pflag v1.0.5
golang.org/x/text v0.14.0
k8s.io/api v0.28.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/libsveltos v0.21.0 h1:NkkGiDbQJyp0WuPkioS4pHzmRwy8XtomNC4dJrZ4mW8=
github.com/projectsveltos/libsveltos v0.21.0/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445 h1:BRQmPXAGVKTWq5GdlvPPZmAe4D5bmR8Bum1pqPCEd8w=
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/addon-compliance-controller-amd64:v0.21.0
image: projectsveltos/addon-compliance-controller-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down

0 comments on commit b8bef86

Please sign in to comment.