From 9748b34f19302cccd37be7aec57261c83142e44a Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 29 Mar 2024 17:11:34 +0200 Subject: [PATCH] Added some debug messages in shell.go. Added docker push and tag to makefile --- Makefile | 4 +++- cmd/buildnumber.go | 2 +- deploy/sthome-webhook/Chart.yaml | 4 ++-- deploy/sthome-webhook/values.yaml | 2 +- sthome/shell.go | 2 ++ util/version.go | 2 +- version.txt | 6 +++--- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3c78a78..cc9a0b6 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ OS ?= $(shell $(GO) env GOOS) ARCH ?= $(shell $(GO) env GOARCH) IMAGE_NAME := "cert-manager-webhook-sthome" -IMAGE_TAG := "0.0.3-alpha.1" +IMAGE_TAG := "0.0.3-alpha.2" OUT := $(shell pwd)/_out @@ -35,6 +35,8 @@ clean: build: dependencies go run cmd/buildnumber.go docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" . + docker tag $(IMAGE_NAME) "docker.io/stuurmcp/$(IMAGE_NAME):$(IMAGE_TAG)" + docker image push "stuurmcp/$(IMAGE_NAME):$(IMAGE_TAG)" .PHONY: rendered-manifest.yaml rendered-manifest.yaml: $(OUT)/rendered-manifest.yaml diff --git a/cmd/buildnumber.go b/cmd/buildnumber.go index 18d43d0..af3bf14 100644 --- a/cmd/buildnumber.go +++ b/cmd/buildnumber.go @@ -9,7 +9,7 @@ import ( ) var ( - version = "0.0.3-alpha.1" + version = "0.0.3-alpha.2" buildTime string ) diff --git a/deploy/sthome-webhook/Chart.yaml b/deploy/sthome-webhook/Chart.yaml index 84336c4..3becbe2 100644 --- a/deploy/sthome-webhook/Chart.yaml +++ b/deploy/sthome-webhook/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "v0.0.3-alpha.1" +appVersion: "v0.0.3-alpha.2" description: Cert-Manager webhook for sthome name: sthome-webhook -version: 0.0.3-alpha.1 +version: 0.0.3-alpha.2 diff --git a/deploy/sthome-webhook/values.yaml b/deploy/sthome-webhook/values.yaml index 631d190..cbcc9e2 100644 --- a/deploy/sthome-webhook/values.yaml +++ b/deploy/sthome-webhook/values.yaml @@ -31,7 +31,7 @@ clusterIssuer: image: repository: stuurmcp/cert-manager-webhook-sthome #repository: wstat.sthome.net:5000/cert-manager-webhook-sthome - tag: 0.0.3-alpha.1 + tag: 0.0.3-alpha.2 #pullPolicy should be IfNotPresent. Set to Always for testing purposes pullPolicy: IfNotPresent diff --git a/sthome/shell.go b/sthome/shell.go index 3f31599..c341af2 100644 --- a/sthome/shell.go +++ b/sthome/shell.go @@ -24,11 +24,13 @@ func Execute(script string, command []string) (bool, error) { err = cmd.Start() if err != nil { + klog.Errorf("CZ: Script Start return error: %s\n", err) return false, err } err = cmd.Wait() if err != nil { + klog.Errorf("CZ: Script Wait return error: %s\n", err) return false, err } diff --git a/util/version.go b/util/version.go index 8388f01..786cd70 100644 --- a/util/version.go +++ b/util/version.go @@ -7,7 +7,7 @@ import ( // These are set during build time via -ldflags var ( - version = "0.0.3+dev" + version = "0.0.3-alpha.2" gitCommit string buildDate string ) diff --git a/version.txt b/version.txt index 891c0c3..554cdf5 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,3 @@ -0.0.3+dev -20240328-2332 -19 \ No newline at end of file +0.0.3-alpha.2 +20240329-1707 +27 \ No newline at end of file