Skip to content

Commit

Permalink
blah
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Kao committed Jul 28, 2023
1 parent e29a158 commit dbf29de
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 19 deletions.
6 changes: 6 additions & 0 deletions .taskfiles/AnsibleTasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ tasks:
cmds:
- "ansible-galaxy install -r requirements.yml --roles-path ~/.ansible/roles --force"
- "ansible-galaxy collection install -r requirements.yml --collections-path ~/.ansible/collections --force"

aptupgrade:
desc: upgrade apt packages
dir: ansible
cmds:
- "ansible all -m apt -a 'upgrade=yes update_cache=yes cache_valid_time=86400' --become"
34 changes: 17 additions & 17 deletions ansible/kubernetes/inventory/group_vars/all/k3s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ k3s_use_unsupported_config: true
# - calico-installation.yaml.j2
# - calico-bgpconfiguration.yaml.j2
# - calico-bgppeer.yaml.j2
k3s_server_manifests_urls:
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
filename: alertmanagerconfigs.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
filename: alertmanagers.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
filename: podmonitors.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
filename: probes.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
filename: prometheuses.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
filename: prometheusrules.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
filename: servicemonitors.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
filename: thanosrulers.yaml
#k3s_server_manifests_urls:
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
# filename: alertmanagerconfigs.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
# filename: alertmanagers.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
# filename: podmonitors.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
# filename: probes.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
# filename: prometheuses.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
# filename: prometheusrules.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
# filename: servicemonitors.yaml
# - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
# filename: thanosrulers.yaml
2 changes: 1 addition & 1 deletion ansible/kubernetes/inventory/group_vars/master/k3s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ k3s_server:
tls-san:
- "{{ k3s_registration_address }}"
docker: false
flannel-backend: "none"
#flannel-backend: "none"
disable:
- traefik
- servicelb
Expand Down
22 changes: 22 additions & 0 deletions ansible/kubernetes/playbooks/apt-upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---

- hosts:
- master
- worker
gather_facts: yes
become: yes
tasks:
- name: Update apt
ansible.builtin.apt: update_cache=yes

- name: Install or upgrade any required packages
ansible.builtin.apt:
upgrade: full

- name: Install any required packages
apt:
pkg: "{{ item }}"
state: present
loop:
- net-tools

File renamed without changes.
2 changes: 1 addition & 1 deletion cluster/apps/networking/multus/app/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:

paths:
config: /var/lib/rancher/k3s/agent/etc/cni/net.d/
bin: /var/lib/rancher/k3s/data/ad774f9b85e0ed18b900fb55939212cdc63b13cfcac93670a6fa7d4ff913d746
bin: /var/lib/rancher/k3s/data/ad774f9b85e0ed18b900fb55939212cdc63b13cfcac93670a6fa7d4ff913d746/bin

version: "0.3.1"

0 comments on commit dbf29de

Please sign in to comment.