temp fix for intel-cloud/cosbench#320. However, hashchecks do not wor…

…k see: intel-cloud/cosbench#406
karasjoh000 · Feb 11, 2021 · a4bd65a · a4bd65a
1 parent 0514897
commit a4bd65a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -30,4 +30,4 @@ COPY driver.conf ${COSBENCH_DIR}/conf
 # DOCKER STARTUP
 #-------------------------------------
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD java -Dcosbench.tomcat.config=conf/controller-tomcat-server.xml -server -cp main/* org.eclipse.equinox.launcher.Main -configuration controller.conf -console 19089
+CMD java -Dcom.amazonaws.services.s3.disableGetObjectMD5Validation=true -Dcosbench.tomcat.config=conf/controller-tomcat-server.xml -server -cp main/* org.eclipse.equinox.launcher.Main -configuration controller.conf -console 19089
diff --git a/images/build.sh b/images/build.sh
@@ -4,14 +4,16 @@
 
 BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 VCS_REF=$(git rev-parse --verify HEAD)
-VERSION=0.0.6
+VERSION=0.0.1
 
 docker build \
-        -t "zenko/zenko-cosbench:${VERSION}" \
+        -t "jkarasev/cosbench:${VERSION}" \
         --build-arg "COSBENCH_VERSION=${COSBENCH_VERSION}" \
         --build-arg "BUILD_DATE=${BUILD_DATE}" \
         --build-arg "VCS_REF=${VCS_REF}" \
         --build-arg "VERSION=${VERSION}" \
+        --build-arg http_proxy=$http_proxy \
+        --build-arg https_proxy=$http_proxy \
         .
 
-echo "Built zenko-cosbench:${VERSION}"
+echo "jkarasev/cosbench:${VERSION}"
diff --git a/templates/controller-deployment.yaml b/templates/controller-deployment.yaml
@@ -36,4 +36,4 @@ spec:
               value: "{{ .Values.controller.logLevel }}"
             - name: DRIVERS
               value: "{{ template "cosbench.driversList" . }}"
-          args: ['java','-Dcosbench.tomcat.config=conf/controller-tomcat-server.xml','-server','-cp','main/*','org.eclipse.equinox.launcher.Main','-configuration','conf/.controller','-console','19089']
+          args: ['java', '-Dcom.amazonaws.services.s3.disableGetObjectMD5Validation=true', '-Dcosbench.tomcat.config=conf/controller-tomcat-server.xml','-server','-cp','main/*','org.eclipse.equinox.launcher.Main','-configuration','conf/.controller','-console','19089']
diff --git a/templates/driver-statefulset.yaml b/templates/driver-statefulset.yaml
@@ -35,7 +35,7 @@ spec:
           env:
             - name: LOG_LEVEL
               value: "{{ .Values.driver.logLevel }}"
-          args: ['java','-Dcosbench.tomcat.config=conf/driver-tomcat-server.xml','-server','-cp','main/*','org.eclipse.equinox.launcher.Main','-configuration','conf/.driver','-console','18089']
+          args: ['java', '-Dcom.amazonaws.services.s3.disableGetObjectMD5Validation=true', '-Dcosbench.tomcat.config=conf/driver-tomcat-server.xml','-server','-cp','main/*','org.eclipse.equinox.launcher.Main','-configuration','conf/.driver','-console','18089']
           resources:
 {{ toYaml .Values.driver.resources | indent 12 }}
       affinity:

diff --git a/values.yaml b/values.yaml
@@ -17,12 +17,12 @@ controller:
   ## controller container image
   ##
   image:
-    repository: zenko/zenko-cosbench
-    tag: 0.0.6
+    repository: jkarasev/cosbench
+    tag: 0.0.1
     pullPolicy: IfNotPresent
 
   service:
-    type: ClusterIP
+    type: LoadBalancer
     port: 19088
 
   ingress:
@@ -49,8 +49,8 @@ driver:
   ## driver container image
   ##
   image:
-    repository: zenko/zenko-cosbench
-    tag: 0.0.6
+    repository: jkarasev/cosbench
+    tag: 0.0.1
     pullPolicy: IfNotPresent
 
   service: