Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-06-02 12:11:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Sat Jun 2 12:11:04 2018 rev:14 rq:613117 version:4.0.0+git_r298_a05a932
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-05-29 10:44:19.961792734 +0200
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-06-02 12:11:39.993049999 +0200
@@ -1,0 +2,74 @@
+Wed May 30 13:33:58 UTC 2018 - [email protected]
+
+- Commit eda9a39 by Maximilian Meister [email protected]
+ mount velum branding
+
+ feature#branding
+
+ Signed-off-by: Maximilian Meister <[email protected]>
+
+
+-------------------------------------------------------------------
+Wed May 30 12:16:02 UTC 2018 - [email protected]
+
+- Commit 70b16ee by David Cassany [email protected]
+ Make use of the %license macro
+
+
+-------------------------------------------------------------------
+Wed May 30 10:33:48 UTC 2018 - [email protected]
+
+- Commit aadfa9b by David Cassany [email protected]
+ Spec cleaning
+
+ * removed env shebang from setup-mysql.sh
+ * removed executable bit from some config files
+
+
+-------------------------------------------------------------------
+Tue May 29 09:50:39 UTC 2018 - [email protected]
+
+- Commit 31544c4 by Jordi Massaguer Pla [email protected]
+ Only require image rpms if we are in a sle version older than sle15
+
+ because sle15 will use the suse registry
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+ Commit 8ebc884 by Jordi Massaguer Pla [email protected]
+ Revert "Remove image RPM requirements"
+
+ This reverts commit 433738bf4bda5eabce933039b504b5b5690f03c5.
+
+ Image RPMs are still required by versions < SLE15
+
+
+-------------------------------------------------------------------
+Mon May 28 16:18:58 UTC 2018 - [email protected]
+
+- Commit 1e7d2ed by Jordi Massaguer Pla [email protected]
+ [Packaging] Require container feeder on sle versions older than sle15
+
+ We were requiring container feeder on distributions different than sle15, but
+ actually we need them to be older, as sle15 and *newer* dont' require it.
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+ Commit 433738b by Jordi Massaguer Pla [email protected]
+ Remove image RPM requirements
+
+ CaaSP 4 (SLE15) won't require the images be installed as RPMs
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+ Commit c6855a1 by Jordi Massaguer Pla [email protected]
+ fix image name for CaaSP4
+
+ We have changed the naming of the images. Instead of calling them
+ sleXY/image_name, we call them caasp/image_name, so we don't have to create a
+ new package each time we change the base image.
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.tgUYxf/_old 2018-06-02 12:11:41.880980754 +0200
+++ /var/tmp/diff_new_pack.tgUYxf/_new 2018-06-02 12:11:41.884980608 +0200
@@ -21,7 +21,7 @@
%endif
%if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
- %define _base_image sles15
+ %define _base_image caasp
%endif
%if 0%{?is_opensuse} && 0%{?suse_version} > 1500
@@ -29,7 +29,7 @@
%endif
Name: caasp-container-manifests
-Version: 4.0.0+git_r285_beebd20
+Version: 4.0.0+git_r298_a05a932
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
@@ -39,9 +39,8 @@
# If it is not SLE15, require container-feeder
# Otherwise, we are using the SUSE Registry
-%if 0%{?sle_version} != 150000
+%if 0%{?sle_version} < 150000
Requires: container-feeder
-%endif
# Require all the docker images
Requires: %{_base_image}-caasp-dex-image >= 2.0.0
@@ -59,6 +58,7 @@
Requires: %{_base_image}-sidecar-image >= 2.0.0
Requires: %{_base_image}-tiller-image >= 2.0.0
Requires: %{_base_image}-velum-image >= 2.0.0
+%endif
# Require all the things we mount from the host from the kubernetes-salt
package
Requires: kubernetes-salt
BuildArch: noarch
@@ -79,7 +79,7 @@
# fix image name
sed -e "s|image:[ ]*sles12/\(.*\):|image: %{_base_image}/\1:|g" -i
%{buildroot}/%{_datadir}/%{name}/$file
done
-install -D -m 0755 config/haproxy/haproxy.cfg
%{buildroot}/etc/caasp/haproxy/haproxy.cfg
+install -D -m 0644 config/haproxy/haproxy.cfg
%{buildroot}/etc/caasp/haproxy/haproxy.cfg
install -D -m 0755 activate.sh %{buildroot}/%{_datadir}/%{name}/activate.sh
# fix image name in activate
sed -e "s|sles12/pause|%{_base_image}/pause|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
@@ -90,7 +90,7 @@
install -D -m 0755 gen-certs.sh %{buildroot}/%{_datadir}/%{name}/gen-certs.sh
for dir in mysql salt/grains salt/minion.d-ca; do
install -d %{buildroot}/%{_datadir}/%{name}/config/$dir
- install config/$dir/* %{buildroot}/%{_datadir}/%{name}/config/$dir
+ install -D -m 0644 config/$dir/* %{buildroot}/%{_datadir}/%{name}/config/$dir
done
cp -R setup %{buildroot}/%{_datadir}/%{name}
@@ -118,10 +118,14 @@
%files
%defattr(-,root,root)
-%doc LICENSE README.md
+%doc README.md
+%if 0%{?suse_version} < 1500
+%doc LICENSE
+%else
+%license LICENSE
+%endif
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/manifests
- /etc/caasp
+%dir /etc/caasp
%dir /etc/caasp/haproxy
%config(noreplace) /etc/caasp/haproxy/haproxy.cfg
%{_sbindir}/rcadmin-node-setup
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/manifests/public.yaml
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml 2018-05-25
15:05:17.000000000 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml 2018-05-30
15:35:37.000000000 +0200
@@ -309,6 +309,15 @@
- mountPath: /etc/caasp/pillar-seeds
name: caasp-pillar-seeds
readOnly: True
+ - mountPath: /srv/velum/PRODUCT
+ name: velum-dist-name
+ readOnly: True
+ - mountPath: /srv/velum/public
+ name: velum-static-pages
+ readOnly: True
+ - mountPath: /srv/velum/app/assets/images
+ name: velum-images
+ readOnly: True
args: ["bin/run"]
- name: velum-api
image: sles12/velum:__TAG__
@@ -577,3 +586,12 @@
- name: caasp-pillar-seeds
hostPath:
path: /etc/caasp/pillar-seeds
+ - name: velum-dist-name
+ hostPath:
+ path: /usr/share/velum/PRODUCT
+ - name: velum-static-pages
+ hostPath:
+ path: /usr/share/velum/public
+ - name: velum-images
+ hostPath:
+ path: /usr/share/velum/images
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/packaging/suse/make_spec.sh
new/caasp-container-manifests-master/packaging/suse/make_spec.sh
--- old/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-25 15:05:17.000000000 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-30 15:35:37.000000000 +0200
@@ -42,7 +42,7 @@
%endif
%if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
- %define _base_image sles15
+ %define _base_image caasp
%endif
%if 0%{?is_opensuse} && 0%{?suse_version} > 1500
@@ -60,9 +60,8 @@
# If it is not SLE15, require container-feeder
# Otherwise, we are using the SUSE Registry
-%if 0%{?sle_version} != 150000
+%if 0%{?sle_version} < 150000
Requires: container-feeder
-%endif
# Require all the docker images
Requires: %{_base_image}-pause-image >= 2.0.0
@@ -80,6 +79,7 @@
Requires: %{_base_image}-tiller-image >= 2.0.0
Requires: %{_base_image}-openldap-image >= 2.0.0
Requires: %{_base_image}-caasp-dex-image >= 2.0.0
+%endif
# Require all the things we mount from the host from the kubernetes-salt
package
Requires: kubernetes-salt
BuildArch: noarch
@@ -100,7 +100,7 @@
# fix image name
sed -e "s|image:[ ]*sles12/\(.*\):|image: %{_base_image}/\1:|g" -i
%{buildroot}/%{_datadir}/%{name}/\$file
done
-install -D -m 0755 config/haproxy/haproxy.cfg
%{buildroot}/etc/caasp/haproxy/haproxy.cfg
+install -D -m 0644 config/haproxy/haproxy.cfg
%{buildroot}/etc/caasp/haproxy/haproxy.cfg
install -D -m 0755 activate.sh %{buildroot}/%{_datadir}/%{name}/activate.sh
# fix image name in activate
sed -e "s|sles12/pause|%{_base_image}/pause|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
@@ -111,7 +111,7 @@
install -D -m 0755 gen-certs.sh %{buildroot}/%{_datadir}/%{name}/gen-certs.sh
for dir in mysql salt/grains salt/minion.d-ca; do
install -d %{buildroot}/%{_datadir}/%{name}/config/\$dir
- install config/\$dir/* %{buildroot}/%{_datadir}/%{name}/config/\$dir
+ install -D -m 0644 config/\$dir/*
%{buildroot}/%{_datadir}/%{name}/config/\$dir
done
cp -R setup %{buildroot}/%{_datadir}/%{name}
@@ -139,10 +139,14 @@
%files
%defattr(-,root,root)
-%doc LICENSE README.md
+%doc README.md
+%if 0%{?suse_version} < 1500
+%doc LICENSE
+%else
+%license LICENSE
+%endif
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/manifests
-$dir /etc/caasp
+%dir /etc/caasp
%dir /etc/caasp/haproxy
%config(noreplace) /etc/caasp/haproxy/haproxy.cfg
%{_sbindir}/rcadmin-node-setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/setup/mysql/setup-mysql.sh
new/caasp-container-manifests-master/setup/mysql/setup-mysql.sh
--- old/caasp-container-manifests-master/setup/mysql/setup-mysql.sh
2018-05-25 15:05:17.000000000 +0200
+++ new/caasp-container-manifests-master/setup/mysql/setup-mysql.sh
2018-05-30 15:35:37.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
umask 377;
# wait until the file exists and has contents
