diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8191fb7..cbde04e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 36b5800..4daacdc 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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