Skip to content

Commit

Permalink
Merge branch 'main' into renovate/community.general-9.x
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Delo <deloa6133@gmail.com>
  • Loading branch information
ol3d authored May 31, 2024
2 parents 0cf8d4b + abec9a4 commit ebaded6
Show file tree
Hide file tree
Showing 69 changed files with 4,797 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
fetch-depth: 0
- name: Generate Token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meta-sync-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- name: Generate Token
uses: tibdex/github-app-token@v2
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-link-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- name: Generate Token
uses: tibdex/github-app-token@v2
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- name: Generate Token
uses: tibdex/github-app-token@v2
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion lab/cluster/core/rook-ceph/rook-ceph/app/helmrelease.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: rook-ceph-operator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: rook-ceph-cluster
Expand Down
1 change: 1 addition & 0 deletions lab/provision/ansible/proxmox/ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ force_valid_group_names = ignore
log_path = ~/.ansible/ansible.log
inventory = ./inventory
roles_path = ~/.ansible/roles:./roles
# roles_path = ./roles
collections_path = ~/.ansible/collections
remote_tmp = /tmp/.ansible/tmp
local_tmp = ~/.ansible/tmp
Expand Down
2 changes: 2 additions & 0 deletions lab/provision/ansible/proxmox/roles/proxmox/.ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
skip_list:
- no-handler
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
ko_fi: sleepingkyoto
custom:
- "https://monappy.jp/u/lae"
12 changes: 12 additions & 0 deletions lab/provision/ansible/proxmox/roles/proxmox/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.*.swp
*.*~*
*.bak

/ansible.cfg
*.retry
/.project
/.pydevproject

fetch/
.vagrant/
/.settings/
40 changes: 40 additions & 0 deletions lab/provision/ansible/proxmox/roles/proxmox/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
language: python
sudo: required
dist: bionic
cache:
directories: [ '$HOME/lxc' ]
pip: true
matrix:
fast_finish: true
include:
# FIXME: Ansible 2.10.x going through major restructuring.
# https://groups.google.com/forum/#!msg/ansible-project/eXsoOKEd0Mk/XTgbnPWbCAAJ
# - env: ANSIBLE_GIT_VERSION='devel' # 2.11.x development branch
- env: ANSIBLE_VERSION='~=2.10.0'
- env: ANSIBLE_VERSION='~=2.9.0'
- env: ANSIBLE_VERSION='~=2.8.0'
install:
- if [ "$ANSIBLE_GIT_VERSION" ]; then pip install "https://github.com/ansible/ansible/archive/${ANSIBLE_GIT_VERSION}.tar.gz";
else pip install "ansible${ANSIBLE_VERSION}"; fi;
pip install --pre ansible-lint; pip install jmespath netaddr
- ansible --version
- ansible-galaxy install lae.travis-lxc,v0.10.1
- ansible-playbook tests/install.yml -i tests/inventory
- git archive --format tar.gz HEAD > lae.proxmox.tar.gz && ansible-galaxy install
lae.proxmox.tar.gz,$(git rev-parse HEAD),lae.proxmox && rm lae.proxmox.tar.gz
before_script: cd tests/
script:
- ansible-lint ../ || true
- ansible-playbook -i inventory deploy.yml --syntax-check
- 'ansible-playbook -i inventory -v deploy.yml --skip skiponlxc & pid=$!; { while true; do sleep 1; kill -0 $pid 2>/dev/null || break; printf "\0"; done }'
- 'ANSIBLE_STDOUT_CALLBACK=debug ANSIBLE_DISPLAY_SKIPPED_HOSTS=no ANSIBLE_DISPLAY_OK_HOSTS=no
unbuffer ansible-playbook --skip skiponlxc -vv -i inventory deploy.yml &> idempotency.log'
- 'grep -A1 "PLAY RECAP" idempotency.log | grep -qP "changed=0 .*failed=0 .*" &&
(echo "Idempotence: PASS"; exit 0) || (echo "Idempotence: FAIL"; cat idempotency.log; exit 1)'
- ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i inventory -v test.yml
notifications:
webhooks:
urls:
- https://galaxy.ansible.com/api/v1/notifications/
- https://t2d.idolactiviti.es/notify
7 changes: 7 additions & 0 deletions lab/provision/ansible/proxmox/roles/proxmox/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2016 Musee Ullah

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25 changes: 25 additions & 0 deletions lab/provision/ansible/proxmox/roles/proxmox/LICENSE_IMPORTS
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
==============================================================================

The following files are licensed under APL2:

library/pve_ceph_volume.py (This is a combined version of the original files module_utils/ca_common.py and library/ceph_volume.py)

The license text from ceph/ceph-ansible is as follows:

Copyright [2014] [Sébastien Han]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

==============================================================================

# Licenses for libraries imported in the future should go here
Loading

0 comments on commit ebaded6

Please sign in to comment.