Merge branch 'developerdurp-main-patch-33140' into 'main'
Update ansible/group_vars/all.yml See merge request developerdurp/k3s!10
This commit is contained in:
@@ -18,11 +18,7 @@ format:
|
|||||||
allow_failure: false
|
allow_failure: false
|
||||||
extends: .terraform_fmt
|
extends: .terraform_fmt
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
changes:
|
|
||||||
compare_to: refs/heads/main
|
|
||||||
paths:
|
|
||||||
- 'terraform/*'
|
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
@@ -33,11 +29,7 @@ validate:
|
|||||||
allow_failure: false
|
allow_failure: false
|
||||||
extends: .terraform_validate
|
extends: .terraform_validate
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
changes:
|
|
||||||
compare_to: refs/heads/main
|
|
||||||
paths:
|
|
||||||
- 'terraform/*'
|
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ extra_server_args: >-
|
|||||||
--kube-scheduler-arg bind-address=0.0.0.0
|
--kube-scheduler-arg bind-address=0.0.0.0
|
||||||
--etcd-expose-metrics true
|
--etcd-expose-metrics true
|
||||||
--kubelet-arg containerd=/run/k3s/containerd/containerd.sock
|
--kubelet-arg containerd=/run/k3s/containerd/containerd.sock
|
||||||
|
--feature-gates RemoveSelfLink=false
|
||||||
extra_agent_args: >-
|
extra_agent_args: >-
|
||||||
{{ extra_args }}
|
{{ extra_args }}
|
||||||
--kubelet-arg node-status-update-frequency=5s
|
--kubelet-arg node-status-update-frequency=5s
|
||||||
|
|||||||
@@ -82,4 +82,3 @@ resource "proxmox_vm_qemu" "k3server" {
|
|||||||
nameserver = var.dnsserver
|
nameserver = var.dnsserver
|
||||||
sshkeys = var.sshkeys
|
sshkeys = var.sshkeys
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user