diff --git a/README.md b/README.md index 14498438..c808637e 100644 --- a/README.md +++ b/README.md @@ -121,11 +121,11 @@ Each of these must be appropriately built in preparation for a new tag: Run the following command inside this directory: - operator-sdk build geerlingguy/tower-operator:0.2.3 + operator-sdk build geerlingguy/tower-operator:0.2.4 Then push the generated image to Docker Hub: - docker push geerlingguy/tower-operator:0.2.3 + docker push geerlingguy/tower-operator:0.2.4 #### Build a new version of the `tower-operator.yaml` file diff --git a/build/chain-operator-files.yml b/build/chain-operator-files.yml index 97ef57b3..fe2fd120 100644 --- a/build/chain-operator-files.yml +++ b/build/chain-operator-files.yml @@ -33,6 +33,10 @@ - "../deploy/service_account.yaml" - "../deploy/operator.yaml" + - name: Remove space at beginning of tower-operator.yml + shell: > + echo "$(tail -n +2 {{ operator_file_path }})" > {{ operator_file_path }} + - name: Template the tower-operator.yaml file into tower-operator.yml template: src: "{{ operator_file_path }}" diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index 4be8b8e8..017840fb 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -122,9 +122,11 @@ definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" register: log - - debug: var=log.stdout_lines + - name: print debug output + debug: var=log.stdout_lines - - fail: + - name: fail if converge didn't succeed + fail: msg: "Failed on action: converge" - import_playbook: '{{ playbook_dir }}/../default/asserts.yml' diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml index 786d018e..dfd3c9de 100644 --- a/molecule/test-minikube/converge.yml +++ b/molecule/test-minikube/converge.yml @@ -128,9 +128,11 @@ definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" register: log - - debug: var=log.stdout_lines + - name: print debug output + debug: var=log.stdout_lines - - fail: + - name: fail if converge didn't succeed + fail: msg: "Failed on action: converge" - import_playbook: '{{ playbook_dir }}/../default/asserts.yml'