diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99dea3c..b07e149 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,5 +35,4 @@ jobs: - name: Trigger a new import on Galaxy. run: >- - ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} - $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2) + ansible-galaxy role import --token ${{ secrets.GALAXY_API_KEY }} -vvvvvvvv --role-name=$(echo ${{ github.repository }} | cut -d/ -f2 | sed 's/ansible-role-//' | sed 's/-/_/') $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d1e2f..203c97c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog --------- +**13.1.1+3.5.13** + +- update `etcd` to `v3.5.13` +- update Github workflow +- Molecule: change IP addresses + **13.1.0+3.5.9** - `systemd` service `etcd` should start after network is online diff --git a/README.md b/README.md index 7216b67..246c1ab 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Upgrading a etcd cluster which was installed by this role is described in [here] Versions -------- -I tag every release and try to stay with [semantic versioning](http://semver.org). If you want to use the role I recommend to checkout the latest tag. The master branch is basically development while the tags mark stable releases. But in general I try to keep master in good shape too. A tag `13.0.0+3.5.9` means this is release `13.0.0` of this role and it's meant to be used with etcd version `3.5.9` (but should work with newer versions also). If the role itself changes `X.Y.Z` before `+` will increase. If the etcd version changes `X.Y.Z` after `+` will increase. This allows to tag bugfixes and new major versions of the role while it's still developed for a specific etcd release. +I tag every release and try to stay with [semantic versioning](http://semver.org). If you want to use the role I recommend to checkout the latest tag. The master branch is basically development while the tags mark stable releases. But in general I try to keep master in good shape too. A tag `13.1.1+3.5.13` means this is release `13.1.1` of this role and it's meant to be used with etcd version `3.5.13` (but should work with newer versions also). If the role itself changes `X.Y.Z` before `+` will increase. If the etcd version changes `X.Y.Z` after `+` will increase. This allows to tag bugfixes and new major versions of the role while it's still developed for a specific etcd release. Changelog --------- @@ -38,7 +38,7 @@ etcd_ca_conf_directory: "{{ '~/etcd-certificates' | expanduser }}" etcd_ansible_group: "k8s_etcd" # etcd version -etcd_version: "3.5.9" +etcd_version: "3.5.13" # Port where etcd listening for clients etcd_client_port: "2379" diff --git a/defaults/main.yml b/defaults/main.yml index a01a542..94b393a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,7 +10,7 @@ etcd_ca_conf_directory: "{{ '~/etcd-certificates' | expanduser }}" etcd_ansible_group: "k8s_etcd" # etcd version -etcd_version: "3.5.9" +etcd_version: "3.5.13" # Port where etcd listening for clients etcd_client_port: "2379" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index fcbe2eb..82051ed 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,5 +1,5 @@ --- -# Copyright (C) 2022 Robert Wimmer +# Copyright (C) 2024 Robert Wimmer # SPDX-License-Identifier: GPL-3.0-or-later dependency: @@ -24,7 +24,7 @@ platforms: - auto_config: true network_name: private_network type: static - ip: 192.168.10.10 + ip: 172.16.10.10 - name: test-etcd2-ubuntu2004 box: generic/ubuntu2004 memory: 2048 @@ -37,7 +37,7 @@ platforms: - auto_config: true network_name: private_network type: static - ip: 192.168.10.20 + ip: 172.16.10.20 - name: test-etcd3-ubuntu2004 box: generic/ubuntu2004 memory: 2048 @@ -50,7 +50,7 @@ platforms: - auto_config: true network_name: private_network type: static - ip: 192.168.10.30 + ip: 172.16.10.30 provisioner: name: ansible