Skip to content

Commit b5f8649

Browse files
authored
Merge pull request #359 from gianlucam76/release-0.18
Release 0.18
2 parents e660023 + 70f4d91 commit b5f8649

12 files changed

Lines changed: 15 additions & 28 deletions

.github/workflows/main.yaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: checkout
17-
uses: actions/checkout@v3
18-
with:
19-
fetch-depth: 0
17+
uses: actions/checkout@v4
2018
- name: Set up Go
2119
uses: actions/setup-go@v3
2220
with:
@@ -35,9 +33,7 @@ jobs:
3533
runs-on: ubuntu-latest
3634
steps:
3735
- name: checkout
38-
uses: actions/checkout@v3
39-
with:
40-
fetch-depth: 0
36+
uses: actions/checkout@v4
4137
- name: Set up Go
4238
uses: actions/setup-go@v3
4339
with:
@@ -50,13 +46,11 @@ jobs:
5046
runs-on: ubuntu-latest
5147
steps:
5248
- name: checkout
53-
uses: actions/checkout@v3
54-
with:
55-
fetch-depth: 0
49+
uses: actions/checkout@v4
5650
- name: Set up Go
5751
uses: actions/setup-go@v3
5852
with:
59-
go-version: 1.19
53+
go-version: 1.20.0
6054
- name: fv
6155
run: make create-cluster fv
6256
env:

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ COPY api/ api/
1515
COPY controllers/ controllers/
1616
COPY pkg/ pkg/
1717
COPY internal/ internal/
18-
COPY version.txt version.txt
1918

2019
# Build
2120
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go

Makefile

Lines changed: 1 addition & 2 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.18.0
28+
TAG ?= v0.18.1
2929

3030
# Get cluster-api version and build ldflags
3131
clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
@@ -124,7 +124,6 @@ tools: $(CONTROLLER_GEN) $(ENVSUBST) $(KUSTOMIZE) $(SETUP_ENVTEST) $(GOLANGCI_LI
124124
clean: ## Remove all built tools
125125
rm -rf $(TOOLS_BIN_DIR)/*
126126
rm -rf $(GENERATED_FILES)
127-
rm -rf version.txt
128127

129128
##@ Development
130129

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:v0.18.0
11+
- image: projectsveltos/addon-controller-amd64:v0.18.1
1212
name: controller

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/onsi/ginkgo/v2 v2.11.0
1919
github.com/onsi/gomega v1.27.8
2020
github.com/pkg/errors v0.9.1
21-
github.com/projectsveltos/libsveltos v0.18.0
21+
github.com/projectsveltos/libsveltos v0.18.1
2222
github.com/prometheus/client_golang v1.16.0
2323
github.com/spf13/pflag v1.0.5
2424
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.18.0 h1:kEb1UgT9Dm9EJk7WmCiX1kuUTGIpoiWvqZqSEmrLHGA=
561-
github.com/projectsveltos/libsveltos v0.18.0/go.mod h1:7PaqLwqxsnsG+lV07m4RO4rOg2gKhlmpJVanWcB84JQ=
560+
github.com/projectsveltos/libsveltos v0.18.1 h1:pJD4BXavrV/HtXyrFrGPPxjWBZuHmomvrw8esVGJ3+Y=
561+
github.com/projectsveltos/libsveltos v0.18.1/go.mod h1:4O07OQ3apCERUugy+9k3KOc1MByW727b2dMVAwnLHnM=
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=

main.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ import (
5757
//+kubebuilder:scaffold:imports
5858
)
5959

60-
//go:generate bash hack/get_version.sh
61-
//go:embed version.txt
62-
//nolint:grouper // run generate embed
63-
var version string
64-
6560
var (
6661
setupLog = ctrl.Log.WithName("setup")
6762
metricsAddr string
@@ -148,7 +143,7 @@ func main() {
148143
go compliances.InitializeManager(ctx, ctrl.Log.WithName("addon-compliances"),
149144
mgr.GetConfig(), mgr.GetClient(), addonComplianceTimer)
150145

151-
setupLog.Info(fmt.Sprintf("starting manager (version %s)", version))
146+
setupLog.Info("starting manager")
152147
if err := mgr.Start(ctx); err != nil {
153148
setupLog.Error(err, "problem running manager")
154149
os.Exit(1)

manifest/manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2191,7 +2191,7 @@ spec:
21912191
- --v=5
21922192
command:
21932193
- /manager
2194-
image: projectsveltos/addon-controller-amd64:v0.18.0
2194+
image: projectsveltos/addon-controller-amd64:v0.18.1
21952195
livenessProbe:
21962196
httpGet:
21972197
path: /healthz

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
- --run-mode=do-not-send-updates
6464
command:
6565
- /manager
66-
image: projectsveltos/drift-detection-manager-amd64:v0.18.0
66+
image: projectsveltos/drift-detection-manager-amd64:v0.18.1
6767
livenessProbe:
6868
httpGet:
6969
path: /healthz

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
- --run-mode=do-not-send-updates
4646
command:
4747
- /manager
48-
image: projectsveltos/drift-detection-manager-amd64:v0.18.0
48+
image: projectsveltos/drift-detection-manager-amd64:v0.18.1
4949
livenessProbe:
5050
httpGet:
5151
path: /healthz

0 commit comments

Comments
 (0)