enhance and fix last things

loic-roux-404 · Mar 29, 2023 · fb3e35e · fb3e35e
1 parent e0151ae
commit fb3e35e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/contabo/main.tf b/contabo/main.tf
@@ -31,8 +31,8 @@ resource "random_password" "dex_client_secret" {
 
 locals {
   ssh_public_key = trimspace(file(pathexpand(var.ssh_public_key)))
-  final_secrets = merge(
-    var.secrets,
+  final_ansible_secrets = merge(
+    var.ansible_secrets,
     {
       dex_client_id = random_password.dex_client_id.result
       dex_client_secret = random_password.dex_client_secret.result
@@ -78,7 +78,7 @@ resource "namedotcom_record" "dns_zone" {
 
 locals {
   ansible_vars = merge(
-    local.final_secrets,
+    local.final_ansible_secrets,
     {
       dex_hostname                 = "dex.${var.domain}"
       waypoint_hostname            = "waypoint.${var.domain}"

diff --git a/contabo/user-data.yaml.tmpl b/contabo/user-data.yaml.tmpl
@@ -1,5 +1,9 @@
 #cloud-config
 
+system_info:
+  default_user:
+    name: ${ssh_username}
+
 ssh_deletekeys: false
 users:
   - name: ${ssh_username}

diff --git a/contabo/variables.tf b/contabo/variables.tf
@@ -83,7 +83,7 @@ variable "ssh_public_key" {
   default   = "~/.ssh/id_rsa.pub"
 }
 
-variable "secrets" {
+variable "ansible_secrets" {
   type        = map(string)
   description = "Define ansible secrets"
   default     = {}

diff --git a/packer/cloud-init.yaml.tmpl b/packer/cloud-init.yaml.tmpl
@@ -28,15 +28,7 @@ autoinstall:
     hostname: ${hostname}-server
     disable_root: false
     timezone: Europe/Paris
-    resize_rootfs: true
     preserve_hostname: false
-    growpart:
-      mode: auto
-      devices: ["/"]
-      ignore_growroot_disabled: false
-    system_info:
-      default_user:
-        name: ${ssh_username}
     users:
       - name: ${ssh_username}
         passwd: ${ssh_password_hash}
@@ -45,7 +37,7 @@ autoinstall:
         sudo: ALL=(ALL) NOPASSWD:ALL
         shell: /bin/bash
   late-commands:
-  # Cgroup ensure v1 as we are using k3s <= 1.25
-    - sed -i -e 's/^#\?PermitRootLogin.*/PermitRootLogin false/g' /target/etc/ssh/sshd_config
+  # Cgroup ensure v1 as v2 is not supported by some tooling (k8s,...)
+    - sed -i -e 's/^#\?PermitRootLogin.*/PermitRootLogin false/g' /etc/ssh/sshd_config
     - sed -ie 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0"/' /target/etc/default/grub
     - curtin in-target --target /target update-grub2
diff --git a/playbook/requirements.txt b/playbook/requirements.txt
@@ -1,4 +1,3 @@
 ansible==7.3.0
 PyYAML
-openshift
 kubernetes
diff --git a/playbook/roles/kubeapps/molecule/default/converge.yml b/playbook/roles/kubeapps/molecule/default/converge.yml
@@ -34,7 +34,6 @@
     - name: Install pre-requisites for k8s module
       ansible.builtin.pip:
         name:
-          - openshift
           - PyYAML
           - kubernetes