Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cluster-02
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
K8S
cluster-02
Commits
fb56dbb6
Verified
Commit
fb56dbb6
authored
2 years ago
by
Rafael László
Browse files
Options
Downloads
Patches
Plain Diff
Remove cis profile and add custom config back
parent
6b4c231b
No related branches found
No related tags found
No related merge requests found
Pipeline
#42739
passed with warnings
2 years ago
Stage: plan
Stage: apply
Stage: ansible
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ansible/k8s/templates/custom-config.yaml.j2
+48
-0
48 additions, 0 deletions
ansible/k8s/templates/custom-config.yaml.j2
ansible/k8s/vars/main.yaml
+3
-2
3 additions, 2 deletions
ansible/k8s/vars/main.yaml
with
51 additions
and
2 deletions
ansible/k8s/templates/custom-config.yaml.j2
0 → 100644
+
48
−
0
View file @
fb56dbb6
{% if active_server is defined %}
server: https://{{ rke2_api_ip }}:9345
{% endif %}
token: {{ rke2_token }}
data-dir: {{ rke2_data_path }}
{% if inventory_hostname in groups[rke2_servers_group_name] %}
cni: {{ rke2_cni }}
disable-kube-proxy: {{ rke2_disable_kube_proxy }}
tls-san:
- cluster.local
- {{ rke2_api_ip }}
{% for san in rke2_additional_sans %}
- {{ san }}
{% endfor %}
{% endif %}
{% if ( combined_node_taints is defined and combined_node_taints|length > 0) %}
node-taint:
{% for taint in combined_node_taints %}
- {{ taint }}
{% endfor %}
{% endif %}
{% if rke2_disable and ( inventory_hostname|string() in groups[rke2_servers_group_name] ) %}
disable: {{ rke2_disable }}
{% endif %}
{% if rke2_kube_apiserver_args is defined and inventory_hostname in groups[rke2_servers_group_name] %}
kube-apiserver-arg: {{ rke2_kube_apiserver_args}}
{% endif %}
{% if ( k8s_node_label is defined ) %}
node-label:
{% for label in k8s_node_label %}
- {{ label }}
{% endfor %}
{% endif %}
snapshotter: {{ rke2_snapshooter }}
node-name: {{ inventory_hostname }}
{% if 'cis' in rke2_cis_profile %}
profile: {{ rke2_cis_profile }}
{%endif%}
{% if rke2_server_options is defined and inventory_hostname in groups[rke2_servers_group_name] %}
{% for option in rke2_server_options %}
{{ option }}
{% endfor %}
{% endif %}
{% if rke2_agent_options is defined and inventory_hostname in groups[rke2_agents_group_name] %}
{% for option in rke2_agent_options %}
{{ option }}
{% endfor %}
{% endif %}
This diff is collapsed.
Click to expand it.
ansible/k8s/vars/main.yaml
+
3
−
2
View file @
fb56dbb6
...
...
@@ -136,7 +136,7 @@ rke2_custom_registry_mirrors:
rke2_custom_registry_path
:
templates/registries.yaml.j2
# Path to RKE2 config file template
#
rke2_config: templates/custom-config.yaml.j2
rke2_config
:
templates/custom-config.yaml.j2
# Etcd snapshot source directory
rke2_etcd_snapshot_source_dir
:
etcd_snapshots
...
...
@@ -155,10 +155,11 @@ rke2_snapshooter: overlayfs
# Deploy RKE2 with default CNI canal
rke2_cni
:
cilium
rke2_disable_kube_proxy
:
true
# Validate system configuration against the selected benchmark
# (Supported value is "cis-1.23" or eventually "cis-1.6" if you are running RKE2 prior 1.25)
rke2_cis_profile
:
"
cis-1.23
"
rke2_cis_profile
:
"
"
# Download Kubernetes config file to the Ansible controller
rke2_download_kubeconf
:
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment