Merge pull request #104 from IBM/akash

Artifactory changes

Author: akgunjal

block-storage-attacher/Dockerfile

@@ -1,17 +1,22 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3-201
+FROM wcp-alchemy-containers-team-access-redhat-docker-remote.artifactory.swg-devops.com/ubi8/ubi-minimal:8.3-201
 # Default values
 ARG git_commit_id=unknown
 ARG git_remote_url=unknown
 ARG build_date=unknown
-ARG jenkins_build_number=unknown
+#ARG jenkins_build_number=unknown
+ARG travis_build_number=unknown
+ARG REPO_SOURCE_URL=blank
+LABEL razee.io/source-url="${REPO_SOURCE_URL}"
+ARG BUILD_URL=blank
+LABEL razee.io/build-url="${BUILD_URL}"
 
 # Add Labels to image to show build details
 LABEL git-commit-id=${git_commit_id}
 LABEL git-remote-url=${git_remote_url}
 LABEL build-date=${build_date}
-LABEL jenkins-build-number=${jenkins_build_number}
+#LABEL jenkins-build-number=${jenkins_build_number}
+LABEL travis_build_number=${travis_build_number}
 
-RUN microdnf update 
 RUN mkdir -p /home/armada-storage/
 RUN mkdir -p /host
 ADD images/systemutil /home/armada-storage

block-storage-attacher/Makefile

@@ -11,6 +11,7 @@ GIT_REMOTE_URL="$(shell git config --get remote.origin.url 2>/dev/null)"
 BUILD_DATE="$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")"
 # Jenkins vars. Set to `unknown` if the variable is not yet defined
 BUILD_NUMBER?=unknown
+TRAVIS_BUILD_NUMBER ?= unknown
 OSS_FILES := Dockerfile go.mod
 
 .PHONY: all
@@ -57,7 +58,10 @@ buildimage: build-systemutil
         --build-arg git_commit_id=${GIT_COMMIT_SHA} \
         --build-arg git_remote_url=${GIT_REMOTE_URL} \
         --build-arg build_date=${BUILD_DATE} \
-        --build-arg jenkins_build_number=${BUILD_NUMBER} \
+#        --build-arg jenkins_build_number=${BUILD_NUMBER} \
+				--build-arg travis_build_number=${TRAVIS_BUILD_NUMBER} \
+				--build-arg REPO_SOURCE_URL=${REPO_SOURCE_URL} \
+				--build-arg BUILD_URL=${BUILD_URL} \
 	-t $(IMAGE):$(VERSION) -f Dockerfile .
 
 

block-storage-attacher/helm/ibm-block-storage-attacher/templates/ibmc-block-attacher-StorageClass.yaml

@@ -7,6 +7,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  annotations:
+    razee.io/source-url: xxxREPO_SOURCE_URLxxx
+    razee.io/build-url: xxxBUILD_URLxxx
 provisioner: ibm.io/ibmc-blockattacher
 parameters:
   attach: "true"

block-storage-attacher/helm/ibm-block-storage-attacher/templates/ibmcloud-block-storage-attacher-DS.yaml

@@ -8,6 +8,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  annotations:
+    razee.io/source-url: xxxREPO_SOURCE_URLxxx
+    razee.io/build-url: xxxBUILD_URLxxx
 spec:
   selector:
     matchLabels:

block-storage-attacher/helm/ibm-block-storage-attacher/templates/ibmcloud-block-storage-attacher-SA.yaml

@@ -9,6 +9,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  annotations:
+    razee.io/source-url: xxxREPO_SOURCE_URLxxx
+    razee.io/build-url: xxxBUILD_URLxxx
 imagePullSecrets:
   - name: bluemix-default-secret
   - name: bluemix-default-secret-regional
@@ -30,6 +33,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  annotations:
+    razee.io/source-url: xxxREPO_SOURCE_URLxxx
+    razee.io/build-url: xxxBUILD_URLxxx
 rules:
 - apiGroups: [""]
   resources: ["persistentvolumes"]
@@ -45,6 +51,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  annotations:
+    razee.io/source-url: xxxREPO_SOURCE_URLxxx
+    razee.io/build-url: xxxBUILD_URLxxx
 subjects:
 - kind: ServiceAccount
   name: {{ .Chart.Name }}