Code Review
/
ta
/
caas-metrics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update versions
[ta/caas-metrics.git]
/
SPECS
/
caas-metrics_server.spec
diff --git
a/SPECS/caas-metrics_server.spec
b/SPECS/caas-metrics_server.spec
index
2c40908
..
f966487
100644
(file)
--- a/
SPECS/caas-metrics_server.spec
+++ b/
SPECS/caas-metrics_server.spec
@@
-14,9
+14,10
@@
%define COMPONENT metrics_server
%define RPM_NAME caas-%{COMPONENT}
%define COMPONENT metrics_server
%define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 0.3.3
-%define RPM_MINOR_VERSION 1
-%define DEPENDENCY_MANAGER_VERSION 0.5.0
+%define RPM_MAJOR_VERSION 0.3.6
+%define RPM_MINOR_VERSION 0
+%define go_version 1.12.10
+%define DEP_MAN_VERSION 0.5.4
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
@@
-25,7
+26,7
@@
Release: %{RPM_MINOR_VERSION}%{?dist}
Summary: Containers as a Service Metrics Server component
License: %{_platform_license} and MIT license and BSD and Apache License and GNU LGPLv3
URL: https://github.com/kubernetes-incubator/metrics-server
Summary: Containers as a Service Metrics Server component
License: %{_platform_license} and MIT license and BSD and Apache License and GNU LGPLv3
URL: https://github.com/kubernetes-incubator/metrics-server
-BuildArch:
x86_64
+BuildArch:
%{_arch}
Vendor: %{_platform_vendor} and kubernetes-incubator/metrics-server unmodified
Source0: %{name}-%{version}.tar.gz
Vendor: %{_platform_vendor} and kubernetes-incubator/metrics-server unmodified
Source0: %{name}-%{version}.tar.gz
@@
-49,8
+50,9
@@
docker build \
--build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \
--build-arg no_proxy="${no_proxy}" \
--build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \
--build-arg no_proxy="${no_proxy}" \
- --build-arg METRICS_SERVER="%{RPM_MAJOR_VERSION}" \
- --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \
+ --build-arg METRICS_SERVER_VERSION="%{RPM_MAJOR_VERSION}" \
+ --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \
+ --build-arg go_version="%{go_version}" \
--tag %{COMPONENT}:%{IMAGE_TAG} \
%{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/
--tag %{COMPONENT}:%{IMAGE_TAG} \
%{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/