Revert "Audit log bugfix"

This reverts commit 0141a51caf9c391aa8492a5d5ef4ba34e60d570b.

Reason for revert: Fails because of missing dependencies

Change-Id: I77f1f5344b4043223778bcabecd559759b3cecc1

diff --git a/ansible/roles/kube_master/defaults/main.yaml b/ansible/roles/kube_master/defaults/main.yaml
index 9e22c4d..6aeadaa 100644 (file)
--- a/ansible/roles/kube_master/defaults/main.yaml
+++ b/ansible/roles/kube_master/defaults/main.yaml
@@ -40,8 +40,8 @@ apiserver_params:
   - "--apiserver-count={{ groups['caas_master']|length|int }}"
   - "--audit-policy-file={{ caas.caas_policy_directory }}/audit-policy.yaml"
   - "--audit-log-format=json"
-  - "--audit-log-maxsize={{ caas.audit_log_file_size }}"
-  - "--audit-log-maxbackup={{ ((audit_disc_size.stdout|int*caas.caas_max_audit_size)/caas.audit_log_file_size)|int }}"
+  - "--audit-log-maxbackup=10"
+  - "--audit-log-maxsize=100"
   - "--audit-log-path=/var/log/audit/kube_apiserver/kube-apiserver-audit.log"
   - "--authorization-mode=Node,RBAC"
   - "--bind-address={{ apiserver }}"

diff --git a/ansible/roles/kube_master/tasks/main.yml b/ansible/roles/kube_master/tasks/main.yml
index ae231e9..49f7499 100644 (file)
--- a/ansible/roles/kube_master/tasks/main.yml
+++ b/ansible/roles/kube_master/tasks/main.yml
@@ -64,7 +64,6 @@
     owner: "{{ caas.uid.kube }}"
     group: "{{ caas.uid.kube }}"
     state: directory
-    mode: 0700
   become_user: "root"
 
 - name: create directory for audit policy
@@ -92,10 +91,6 @@
     - "{{ caas.uid.kube }}"
     - "{{ users.admin_user_name }}"
   become_user: "root"
- 
-- name: Ask the audit log disc size
-  shell: df -BM --output=size,target | grep audit | awk '{print $1}' | tr -d 'M'
-  register: audit_disc_size
 
 - name: template apiserver
   vars:

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 3834bd9..53a9e00 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.15.2
-%define RPM_MINOR_VERSION 2
+%define RPM_MINOR_VERSION 1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1