Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding Kubernetes recommended labels to resources #596

Merged
merged 10 commits into from
Feb 5, 2020
Merged

Adding Kubernetes recommended labels to resources #596

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a5da07
Added some basic labels to the resource deployments
Cottonglow Jan 13, 2020
62a3593
Merge master from kedacore and updated labels for the new files
Cottonglow Jan 30, 2020
afc9ec0
Corrected the formatting for deploy file
Cottonglow Jan 31, 2020
b59e4ab
Updated versions to 1.1.0
Cottonglow Feb 3, 2020
d89ecb9
Resolve merge
Cottonglow Feb 3, 2020
d8821e4
Merge branch 'master' of https://github.com/kedacore/keda
Cottonglow Feb 3, 2020
ea41605
Updated Makefile to substitute version in version.go
Cottonglow Feb 4, 2020
373f40a
Revert version change in go file and use IMAGE_TAG instead of new VER…
Cottonglow Feb 4, 2020
afd9de9
Updated release process for the new labels
Cottonglow Feb 4, 2020
f142d68
Update HPA to reference the ScaledObject in the part-of label
Cottonglow Feb 5, 2020
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
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ IMAGE_REPO ?= kedacore
IMAGE_CONTROLLER = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda:$(IMAGE_TAG)
IMAGE_ADAPTER = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-metrics-adapter:$(IMAGE_TAG)

VERSION ?= 1.1.0
Cottonglow marked this conversation as resolved.
Show resolved Hide resolved

ARCH ?=amd64
CGO ?=0
Expand Down Expand Up @@ -68,12 +69,12 @@ build: checkenv build-adapter build-controller
.PHONY: build-controller
build-controller: generate-api pkg/scalers/liiklus/LiiklusService.pb.go
$(GO_BUILD_VARS) operator-sdk build $(IMAGE_CONTROLLER) \
--go-build-args "-ldflags -X=main.GitCommit=$(GIT_COMMIT) -o build/_output/bin/keda"
--go-build-args "-ldflags -X=main.GitCommit=$(GIT_COMMIT) -ldflags -X=github.com/kedacore/keda/version.Version=$(VERSION) -o build/_output/bin/keda"

.PHONY: build-adapter
build-adapter: generate-api pkg/scalers/liiklus/LiiklusService.pb.go
$(GO_BUILD_VARS) go build \
-ldflags "-X=main.GitCommit=$(GIT_COMMIT)" \
-ldflags "-X=main.GitCommit=$(GIT_COMMIT) -X=github.com/kedacore/keda/version.Version=$(VERSION)" \
-o build/_output/bin/keda-adapter \
cmd/adapter/main.go
docker build -f build/Dockerfile.adapter -t $(IMAGE_ADAPTER) .
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

var (
Version = "1.1.0"
Version = "1.0.0"
Cottonglow marked this conversation as resolved.
Show resolved Hide resolved
)