Update .gitlab-ci.yml, ansible/group_vars/all.yml
This commit is contained in:
@@ -73,11 +73,6 @@ k3s:
|
|||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule"
|
- if: $CI_PIPELINE_SOURCE == "schedule"
|
||||||
when: never
|
when: never
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
|
||||||
changes:
|
|
||||||
paths:
|
|
||||||
- 'ansible/dns.yml'
|
|
||||||
when: never
|
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
- if: '$CI_COMMIT_BRANCH == "main"'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
@@ -100,11 +95,6 @@ k3s-ansible:
|
|||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule"
|
- if: $CI_PIPELINE_SOURCE == "schedule"
|
||||||
when: never
|
when: never
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
|
||||||
changes:
|
|
||||||
paths:
|
|
||||||
- 'ansible/dns.yml'
|
|
||||||
when: never
|
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
- if: '$CI_COMMIT_BRANCH == "main"'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
@@ -113,24 +103,6 @@ k3s-ansible:
|
|||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
k3s-dns:
|
|
||||||
stage: ansible
|
|
||||||
variables:
|
|
||||||
WORKDIR: $CI_PROJECT_DIR/ansible
|
|
||||||
FILE: dns.yml
|
|
||||||
REQUIREMENTS: requirements.yml
|
|
||||||
allow_failure: false
|
|
||||||
extends: .ansible_apply
|
|
||||||
before_script:
|
|
||||||
- cat $ansible > $WORKDIR/ansible
|
|
||||||
rules:
|
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
|
||||||
changes:
|
|
||||||
paths:
|
|
||||||
- 'ansible/dns.yml'
|
|
||||||
when: always
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
k3s-update:
|
k3s-update:
|
||||||
stage: ansible
|
stage: ansible
|
||||||
variables:
|
variables:
|
||||||
@@ -157,11 +129,6 @@ k3s-destroy:
|
|||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule"
|
- if: $CI_PIPELINE_SOURCE == "schedule"
|
||||||
when: never
|
when: never
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
|
||||||
changes:
|
|
||||||
paths:
|
|
||||||
- 'ansible/dns.yml'
|
|
||||||
when: never
|
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
- if: '$CI_COMMIT_BRANCH == "main"'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -40,7 +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
|
||||||
|
|||||||
Reference in New Issue
Block a user