Merge pull request #252 from dulek/4.6-housekeeping

Bump versions to 4.6
openshift · Jun 3, 2020 · 6c2b6b6 · 6c2b6b6
2 parents 249f0a4 + df42746
commit 6c2b6b6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/openshift-kuryr-cni-ci-rhel8.Dockerfile b/openshift-kuryr-cni-ci-rhel8.Dockerfile
@@ -30,5 +30,5 @@ LABEL \
         maintainer="Michal Dulko <mdulko@redhat.com>" \
         name="openshift/kuryr-cni" \
         io.k8s.display-name="kuryr-cni" \
-        version="4.5.0" \
+        version="4.6.0" \
         com.redhat.component="kuryr-cni-container"
diff --git a/openshift-kuryr-cni-rhel8.Dockerfile b/openshift-kuryr-cni-rhel8.Dockerfile
@@ -26,5 +26,5 @@ LABEL \
         maintainer="Michal Dulko <mdulko@redhat.com>" \
         name="openshift/kuryr-cni" \
         io.k8s.display-name="kuryr-cni" \
-        version="4.5.0" \
+        version="4.6.0" \
         com.redhat.component="kuryr-cni-container"
diff --git a/openshift-kuryr-controller-ci-rhel8.Dockerfile b/openshift-kuryr-controller-ci-rhel8.Dockerfile
@@ -19,5 +19,5 @@ LABEL \
         maintainer="Michal Dulko <mdulko@redhat.com>" \
         name="openshift/kuryr-controller" \
         io.k8s.display-name="kuryr-controller" \
-        version="4.5.0" \
+        version="4.6.0" \
         com.redhat.component="kuryr-controller-container"
diff --git a/openshift-kuryr-controller-rhel8.Dockerfile b/openshift-kuryr-controller-rhel8.Dockerfile
@@ -15,5 +15,5 @@ LABEL \
         maintainer="Michal Dulko <mdulko@redhat.com>" \
         name="openshift/kuryr-controller" \
         io.k8s.display-name="kuryr-controller" \
-        version="4.5.0" \
+        version="4.6.0" \
         com.redhat.component="kuryr-controller-container"
diff --git a/openshift-kuryr-kubernetes-rhel8.spec b/openshift-kuryr-kubernetes-rhel8.spec
@@ -13,7 +13,7 @@ with OpenStack networking.
 %global commit 0000000
 
 Name:      openshift-%project
-Version:   4.5.1
+Version:   4.6.1
 Release:   1%{?dist}
 Summary:   OpenStack networking integration with OpenShift and Kubernetes
 License:   ASL 2.0

diff --git a/openshift-kuryr-tester-rhel8.Dockerfile b/openshift-kuryr-tester-rhel8.Dockerfile
@@ -12,5 +12,5 @@ LABEL \
         maintainer="Michal Dulko <mdulko@redhat.com>" \
         name="openshift/kuryr-tester" \
         io.k8s.display-name="kuryr-tester" \
-        version="4.5.0" \
+        version="4.6.0" \
         com.redhat.component="kuryr-tester-container"
diff --git a/tools/build-rpm-rhel8.sh b/tools/build-rpm-rhel8.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-version=4.5.1
+version=4.6.1
 source_path=_output/SOURCES
 
 mkdir -p ${source_path}
@@ -16,7 +16,7 @@ cp openshift-kuryr.tmpfs ${source_path}
 cp kuryr-cni.service ${source_path}
 
 # NOTE(dulek): We use this to get python3-pbr package in here.
-curl http://base-openstack-4-3.ocp.svc > /etc/yum.repos.d/base-openstack-4-3.repo
+curl http://base-openstack-4-6.ocp.svc > /etc/yum.repos.d/base-openstack-4-6.repo
 
 yum install -y python3-pbr python3-devel