From d2abe03fa20cf88bd524dc030ddb25e72bca2f2b Mon Sep 17 00:00:00 2001 From: Krisztian Lengyel Date: Fri, 14 Jun 2019 14:30:02 +0200 Subject: [PATCH] Update CPU Pooler to version v0.3.0 - Current master (2467d88) in CPU Pooler will be the released as version v0.3.0. - Add curl to CPU pooler docker image, because it's used in MutatingAdmissionWebhook cleanup. Change-Id: I886000560e5770c99d9cc47da48f3a1e57e93122 --- docker-build/cpupooler/Dockerfile | 5 +++-- docker-build/process-starter/Dockerfile | 2 +- rpmbuild.spec | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-build/cpupooler/Dockerfile b/docker-build/cpupooler/Dockerfile index 52e3a26..aeba20d 100644 --- a/docker-build/cpupooler/Dockerfile +++ b/docker-build/cpupooler/Dockerfile @@ -25,11 +25,12 @@ ENV BUILD_DIR="$GOPATH/src/github.com/nokia/CPU-Pooler" RUN apk update \ && apk upgrade \ -&& apk add --no-cache --virtual .build-deps build-base git mercurial go glide bash tar curl \ +&& apk add --no-cache --virtual .build-deps build-base git mercurial go glide bash tar \ +&& apk add --no-cache curl \ && curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 \ && chmod +x /usr/local/bin/dep \ && mkdir -p $BUILD_DIR \ -&& git clone https://github.com/Levovar/CPU-Pooler.git $BUILD_DIR \ +&& git clone https://github.com/nokia/CPU-Pooler.git $BUILD_DIR \ && cd $BUILD_DIR \ && git fetch --tags \ && git checkout ${CPUPOOLER_VERSION} \ diff --git a/docker-build/process-starter/Dockerfile b/docker-build/process-starter/Dockerfile index bcb1e0c..92c0b75 100644 --- a/docker-build/process-starter/Dockerfile +++ b/docker-build/process-starter/Dockerfile @@ -44,7 +44,7 @@ RUN yum update -y \ && curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 \ && chmod +x /usr/local/bin/dep \ && mkdir -p $BUILD_DIR \ -&& git clone https://github.com/Levovar/CPU-Pooler.git $BUILD_DIR \ +&& git clone https://github.com/nokia/CPU-Pooler.git $BUILD_DIR \ && cd $BUILD_DIR \ && git fetch --tags \ && git checkout ${CPUPOOLER_VERSION} \ diff --git a/rpmbuild.spec b/rpmbuild.spec index fdc4038..dee7c37 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -15,9 +15,9 @@ %define COMPONENT cpupooler %define COMPONENT_PART process-starter %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 0.2.0 -%define RPM_MINOR_VERSION 4 -%define CPUPOOLER_VERSION 808b717165c10b0752bbafd4e2898d4e20c2fae8 +%define RPM_MAJOR_VERSION 0.3.0 +%define RPM_MINOR_VERSION 1 +%define CPUPOOLER_VERSION 2467d8805f309c4294a0e63af70038a7d1372391 %define DEPENDENCY_MANAGER_VERSION 0.5.0 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define PROCESS_STARTER_INSTALL_PATH /opt/bin/ -- 2.16.6