diff --git a/platform/proxmox/ansible/playbooks/portainer-k3s.yml b/platform/proxmox/ansible/playbooks/portainer-k3s.yml index bf0f94d..b09e4e7 100644 --- a/platform/proxmox/ansible/playbooks/portainer-k3s.yml +++ b/platform/proxmox/ansible/playbooks/portainer-k3s.yml @@ -85,9 +85,9 @@ ansible.builtin.command: kubectl -n {{ ns }} rollout status deployment/portainer --timeout=300s changed_when: false - - name: Version und Edition über NodePort (Knoten k3s) + - name: Version über NodePort (Knoten k3s, ohne Anmeldung) ansible.builtin.uri: - url: "https://{{ hostvars['k3s'].ansible_host }}:30779/api/system/version" + url: "https://{{ hostvars['k3s'].ansible_host }}:30779/api/system/status" validate_certs: false return_content: true register: ver @@ -95,9 +95,14 @@ retries: 6 delay: 5 + - name: Edition aus dem Startprotokoll (CE-Binary meldet sich als portainer/portainer, EE als portainer-ee) + ansible.builtin.shell: kubectl -n {{ ns }} logs deployment/portainer | grep -o 'image_tag=[^ ]*' | tail -1 + register: tag + changed_when: false + - name: Ergebnis ansible.builtin.assert: that: - - ver.json.ServerEdition == 'CE' - - ver.json.ServerVersion == version - success_msg: "Portainer {{ ver.json.ServerEdition }} {{ ver.json.ServerVersion }} unter https://{{ hostvars['k3s'].ansible_host }}:30779" + - ver.json.Version == version + - "'ee' not in tag.stdout" + success_msg: "Portainer CE {{ ver.json.Version }} ({{ tag.stdout }}) unter https://{{ hostvars['k3s'].ansible_host }}:30779"