diff --git a/defaults/main.yml b/defaults/main.yml index 58b219b..1d24c82 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,2 @@ my_context: minikube -traefik_version: 2.1 +traefik_version: "2.1" diff --git a/tasks/main.yml b/tasks/main.yml index 3dbf9cb..3c054e1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,59 +1,5 @@ - name: Dashboard setup block: - - name: namespace - k8s: - context: "{{ my_context }}" - state: present - name: weave - api_version: v1 - kind: Namespace - - - name: Create a Secret object for basic authentification (traefik 1.7) - k8s: - state: present - context: "{{ my_context }}" - definition: - apiVersion: v1 - kind: Secret - metadata: - name: basic-auth - namespace: kubernetes-dashboard - type: Opaque - data: - basic_auth: "{{ basic_auth_data | b64encode }}" - when: - - basic_auth == true - - traefik_version is not defined or traefik_version | regex_search('(1.)') - - - name: Remove a Secret object for basic authentification (traefik 1.7) - k8s: - state: absent - context: "{{ my_context }}" - definition: - apiVersion: v1 - kind: Secret - metadata: - name: basic-auth - namespace: kubernetes-dashboard - type: Opaque - data: - basic_auth: "{{ basic_auth_data | b64encode }}" - when: - - traefik_version is defined - - traefik_version | regex_search('(2.)') - - - name: Remove old existing Ingress object - k8s: - context: "{{ my_context }}" - state: absent - api_version: extensions/v1beta1 - kind: Ingress - namespace: kubernetes-dashboard - name: kubernetes-dashboard - when: - - traefik_version is defined - - traefik_version | regex_search('(2.)') - - name: dashboard install k8s: state: present @@ -101,9 +47,9 @@ Authorization: "Bearer {{ token_value.stdout | b64decode }}" when: - traefik_version is defined - - traefik_version | regex_search('(2.)') + - traefik_version | regex_search('(^2.)') - - name: dashboard install + - name: ingress dashboard install k8s: state: present context: "{{ my_context }}"