Merge pull request #50 from kawych/version_2

Fix a tag for first Custom Metrics - Stackdriver Adapter version
GoogleCloudPlatform · Sep 20, 2017 · 9ed0a2b · 9ed0a2b
2 parents 692c11f + 7de828a
commit 9ed0a2b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/custom-metrics-stackdriver-adapter/Makefile b/custom-metrics-stackdriver-adapter/Makefile
@@ -2,7 +2,7 @@ ARCH?=amd64
 OUT_DIR?=build
 PACKAGE=github.com/GoogleCloudPlatform/k8s-stackdriver/custom-metrics-stackdriver-adapter
 PREFIX?=gcr.io/google-containers
-TAG = v1.0
+TAG = v0.1.0
 PKG := $(shell find pkg/* -type f)
 
 .PHONY: build docker push test clean

diff --git a/...-metrics-stackdriver-adapter/adapter.yaml → ...cs-stackdriver-adapter/adapter-alpha.yaml b/...-metrics-stackdriver-adapter/adapter.yaml → ...cs-stackdriver-adapter/adapter-alpha.yaml
@@ -26,7 +26,7 @@ spec:
  kubernetes.io/cluster-service: "true"
  spec:
  containers:
- - image: gcr.io/google-containers/custom-metrics-stackdriver-adapter:v1.0
+ - image: gcr.io/google-containers/custom-metrics-stackdriver-adapter:v0.1.0
  imagePullPolicy: Always
  name: pod-custom-metrics-stackdriver-adapter
  command:

diff --git a/custom-metrics-stackdriver-adapter/pkg/adapter/server/start.go b/custom-metrics-stackdriver-adapter/pkg/adapter/server/start.go
@@ -51,10 +51,8 @@ func NewCommandStartSampleAdapterServer(out, errOut io.Writer, stopCh <-chan str
  if err := o.Validate(args); err != nil {
  return err
  }
- if err := o.RunCustomMetricsAdapterServer(stopCh); err != nil {
- return err
- }
- return nil
+ err := o.RunCustomMetricsAdapterServer(stopCh)
+ return err
  },
  }
 

diff --git a/event-adapter/cmd/server/start.go b/event-adapter/cmd/server/start.go
@@ -46,10 +46,8 @@ func NewCommandStartSampleAdapterServer(out, errOut io.Writer, stopCh <-chan str
  if err := o.Validate(args); err != nil {
  return err
  }
- if err := o.RunEventsAdapterServer(stopCh, maxRetrievedEvents, sinceMillis); err != nil {
- return err
- }
- return nil
+ err := o.RunEventsAdapterServer(stopCh, maxRetrievedEvents, sinceMillis)
+ return err
  },
  }
  flags := cmd.Flags()