Skip to content

Commit

Permalink
Merge pull request #45 from AliyunContainerService/feature/release-v1…
Browse files Browse the repository at this point in the history
….1.0

add new docker images and update docs
  • Loading branch information
ringtail authored Oct 30, 2019
2 parents 03a3e2b + 04d7a72 commit 75a31bc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x


VERSION?=v1.0.0
VERSION?=v1.1.0
GIT_COMMIT:=$(shell git rev-parse --short HEAD)


Expand Down Expand Up @@ -35,7 +35,7 @@ test-unit-cov: clean sanitize build
hack/coverage.sh

docker-container:
docker build --pull -t $(PREFIX)/kube-eventer-$(ARCH):$(VERSION)-$(GIT_COMMIT) -f deploy/Dockerfile .
docker build --pull -t $(PREFIX)/kube-eventer-$(ARCH):$(VERSION)-$(GIT_COMMIT)-aliyun -f deploy/Dockerfile .

clean:
rm -f kube-eventer
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
serviceAccount: kube-eventer
containers:
- image: registry.cn-hangzhou.aliyuncs.com/acs/kube-eventer-amd64:v1.0.0-d9898e1-aliyun
- image: registry.aliyuncs.com/acs/kube-eventer-amd64:v1.1.0-63e7f98-aliyun
name: kube-eventer
command:
- "/kube-eventer"
Expand Down Expand Up @@ -134,7 +134,8 @@ Supported Sinks:
| <a href="docs/en/honeycomb-sink.md">honeycomb</a> | sink to honeycomb |
| <a href="docs/en/influxdb-sink.md">influxdb</a> | sink to influxdb |
| <a href="docs/en/kafka-sink.md">kafka</a> | sink to kafka |
| <a href="docs/en/log-sink.md">log</a> | sink to standard output |
| <a href="docs/en/mysql-sink.md">mysql</a> | sink to mysql database |
| <a href="docs/en/wechat-sink.md">wechat</a> | sink to wechat |

### Contributing
Please check <a href="docs/en/CONTRIBUTING.md" target="_blank">CONTRIBUTING.md</a>
Expand Down
2 changes: 1 addition & 1 deletion deploy/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccount: admin
containers:
- name: kube-eventer
image: registry.cn-beijing.aliyuncs.com/acs/kube-eventer-amd64:v1.0.0-d9898e1-aliyun
image: registry.aliyuncs.com/acs/kube-eventer-amd64:v1.1.0-63e7f98-aliyun
imagePullPolicy: IfNotPresent
command:
- /kube-eventer
Expand Down
2 changes: 1 addition & 1 deletion eventer.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func main() {
setMaxProcs()

klog.Infof(strings.Join(os.Args, " "))
klog.Infof("Eventer version %v", version.VersionInfo())
klog.Info(version.VersionInfo())
if err := validateFlags(); err != nil {
klog.Fatal(err)
}
Expand Down
11 changes: 5 additions & 6 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ package version

import (
"fmt"
)

"k8s.io/client-go/pkg/version"
var (
Version = ""
GitCommit = ""
)

func VersionInfo() string {

info := version.Get()
v := fmt.Sprintf("GoVersion:\t%s\nPlatform:\t%s\nVersion:\t%s\nBuildTime:\t%s\nGitCommit:\t%s\n\n",
info.GoVersion, info.Platform, info.GitVersion, info.BuildDate, info.GitCommit)
return v
return fmt.Sprintf("kube-eventer version: %s commit: %s\n", Version, GitCommit)
}

0 comments on commit 75a31bc

Please sign in to comment.