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

Prepare for dev to main merge #13

Merged
merged 1 commit into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.12.0
TAG ?= main

# Get cluster-api version and build ldflags
clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
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.12.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 @@ -12,7 +12,7 @@ require (
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.8
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.12.0
github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0
github.com/spf13/pflag v1.0.5
k8s.io/api v0.27.2
k8s.io/apiextensions-apiserver v0.27.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,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.12.0 h1:tlFcFGN51UJS7m1b1+8OT/AYOjsvPWcgYLLZbMi9O9U=
github.com/projectsveltos/libsveltos v0.12.0/go.mod h1:2Qq4Iw2e/nYrdI42J6t6Gmkr5S0ozrREzdSAZO17Jkc=
github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0 h1:URTa73p/hJ/rsXqh+Em2mAcTlQbwKg6Sm2FREqpszwE=
github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0/go.mod h1:2Qq4Iw2e/nYrdI42J6t6Gmkr5S0ozrREzdSAZO17Jkc=
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/addon-compliance-controller-amd64:v0.12.0
image: projectsveltos/addon-compliance-controller-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down