Update .gitlab-ci.yml, ansible/group_vars/all.yml

This commit is contained in:
2022-11-19 17:10:08 +00:00
parent 550c87e810
commit 92e3172b95
2 changed files with 1 additions and 34 deletions

View File

@@ -73,11 +73,6 @@ k3s:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:
- 'ansible/dns.yml'
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:
@@ -100,11 +95,6 @@ k3s-ansible:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:
- 'ansible/dns.yml'
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:
@@ -113,24 +103,6 @@ k3s-ansible:
when: always
- 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:
stage: ansible
variables:
@@ -157,11 +129,6 @@ k3s-destroy:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:
- 'ansible/dns.yml'
when: never
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
paths:

View File

@@ -40,7 +40,7 @@ extra_server_args: >-
--kube-scheduler-arg bind-address=0.0.0.0
--etcd-expose-metrics true
--kubelet-arg containerd=/run/k3s/containerd/containerd.sock
--feature-gates RemoveSelfLink=false
extra_agent_args: >-
{{ extra_args }}
--kubelet-arg node-status-update-frequency=5s