Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-05-18 14:27:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Fri May 18 14:27:39 2018 rev:11 rq:610126 version:4.0.0+git_r283_c4e427f
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-05-16 18:45:03.779771239 +0200
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-05-18 14:27:54.246368151 +0200
@@ -1,0 +2,7 @@
+Wed May 16 12:54:32 UTC 2018 - [email protected]
+
+- Commit b74681d by Rafael Fernández López [email protected]
+ Update manifests to match haproxy changes to work as an http proxy
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.HnC5rQ/_old 2018-05-18 14:27:54.838346426 +0200
+++ /var/tmp/diff_new_pack.HnC5rQ/_new 2018-05-18 14:27:54.842346280 +0200
@@ -29,7 +29,7 @@
%endif
Name: caasp-container-manifests
-Version: 4.0.0+git_r281_fdda2c3
+Version: 4.0.0+git_r283_c4e427f
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caasp-container-manifests-master/admin-node-setup.sh
new/caasp-container-manifests-master/admin-node-setup.sh
--- old/caasp-container-manifests-master/admin-node-setup.sh 2018-05-15
04:58:20.000000000 +0200
+++ new/caasp-container-manifests-master/admin-node-setup.sh 2018-05-16
14:55:02.000000000 +0200
@@ -72,7 +72,7 @@
listen velum
bind 0.0.0.0:80
- bind 0.0.0.0:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+ bind 0.0.0.0:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file
/etc/pki/ca.crt
mode http
acl path_autoyast path_reg ^/autoyast$
option forwardfor
@@ -83,7 +83,7 @@
server velum unix@/var/run/puma/dashboard.sock
listen velum-api
- bind 127.0.0.1:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+ bind 127.0.0.1:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file
/etc/pki/ca.crt
mode http
option forwardfor
http-request set-header X-Forwarded-Proto https
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/config/haproxy/haproxy.cfg
new/caasp-container-manifests-master/config/haproxy/haproxy.cfg
--- old/caasp-container-manifests-master/config/haproxy/haproxy.cfg
2018-05-15 04:58:20.000000000 +0200
+++ new/caasp-container-manifests-master/config/haproxy/haproxy.cfg
2018-05-16 14:55:02.000000000 +0200
@@ -13,7 +13,7 @@
listen velum
bind 0.0.0.0:80
- bind 0.0.0.0:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+ bind 0.0.0.0:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file
/etc/pki/ca.crt
mode http
acl path_autoyast path_reg ^/autoyast$
option forwardfor
@@ -24,7 +24,7 @@
server velum unix@/var/run/puma/dashboard.sock
listen velum-api
- bind 127.0.0.1:444 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+ bind 127.0.0.1:444 ssl crt /etc/pki/private/velum-bundle.pem ca-file
/etc/pki/ca.crt
mode http
option forwardfor
http-request set-header X-Forwarded-Proto https
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/manifests/haproxy.yaml
new/caasp-container-manifests-master/manifests/haproxy.yaml
--- old/caasp-container-manifests-master/manifests/haproxy.yaml 2018-05-15
04:58:20.000000000 +0200
+++ new/caasp-container-manifests-master/manifests/haproxy.yaml 2018-05-16
14:55:02.000000000 +0200
@@ -28,13 +28,16 @@
volumeMounts:
- name: haproxy-cfg
mountPath: /etc/haproxy
+ - name: ca-certificate
+ mountPath: /etc/pki/ca.crt
+ readOnly: True
+ - name: kubernetes-proxy-bundle-certificate
+ mountPath: /etc/pki/private/kube-apiserver-proxy-bundle.pem
+ readOnly: True
- name: etc-hosts
mountPath: /etc/hosts
- name: velum-bundle-certificate
- mountPath: /etc/pki/velum.pem
- readOnly: True
- - name: ca-certificate
- mountPath: /etc/pki/ca.crt
+ mountPath: /etc/pki/private/velum-bundle.pem
readOnly: True
- name: velum-unix-socket
mountPath: /var/run/puma
@@ -42,15 +45,20 @@
- name: haproxy-cfg
hostPath:
path: /etc/caasp/haproxy
+ - name: ca-certificate
+ hostPath:
+ path: /etc/pki/ca.crt
+ type: FileOrCreate
+ - name: kubernetes-proxy-bundle-certificate
+ hostPath:
+ path: /etc/pki/private/kube-apiserver-proxy-bundle.pem
+ type: FileOrCreate
- name: etc-hosts
hostPath:
path: /etc/hosts
- name: velum-bundle-certificate
hostPath:
path: /etc/pki/private/velum-bundle.pem
- - name: ca-certificate
- hostPath:
- path: /etc/pki/ca.crt
- name: velum-unix-socket
hostPath:
path: /var/run/puma
