From dfcb7d7c973e79cceb622550a4d1eccfbbcb80f4 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 5 Jun 2024 16:24:32 +0300 Subject: [PATCH 1/3] Enable TLS for image-cache webserver This means we can use https for the image references from the BMH Note this will require https://github.com/suse-edge/charts/pull/130 --- .../templates/rke2-agent.yaml.j2 | 4 +- .../templates/rke2-control-plane.yaml.j2 | 4 +- roles/image-cache/defaults/main.yml | 2 + roles/image-cache/files/httpd.conf | 551 ++++++++++++++++++ roles/image-cache/tasks/main.yml | 63 +- roles/metal3/defaults/main.yml | 4 +- roles/metal3/tasks/main.yml | 11 + roles/metal3/templates/metal3-values.yaml.j2 | 2 + .../templates/tls-ca-additional.yaml.j2 | 14 + 9 files changed, 649 insertions(+), 6 deletions(-) create mode 100644 roles/image-cache/files/httpd.conf create mode 100644 roles/metal3/templates/tls-ca-additional.yaml.j2 diff --git a/roles/example-manifests/templates/rke2-agent.yaml.j2 b/roles/example-manifests/templates/rke2-agent.yaml.j2 index 32e60a3..8083865 100644 --- a/roles/example-manifests/templates/rke2-agent.yaml.j2 +++ b/roles/example-manifests/templates/rke2-agent.yaml.j2 @@ -81,10 +81,10 @@ spec: matchLabels: cluster-role: worker image: - checksum: http://imagecache.local:8080/{{ downstream_cluster_image }}.sha256 + checksum: https://imagecache.local:8443/{{ downstream_cluster_image }}.sha256 checksumType: sha256 format: raw - url: http://imagecache.local:8080/{{ downstream_cluster_image }} + url: https://imagecache.local:8443/{{ downstream_cluster_image }} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: Metal3DataTemplate diff --git a/roles/example-manifests/templates/rke2-control-plane.yaml.j2 b/roles/example-manifests/templates/rke2-control-plane.yaml.j2 index 61476ba..0a12f51 100644 --- a/roles/example-manifests/templates/rke2-control-plane.yaml.j2 +++ b/roles/example-manifests/templates/rke2-control-plane.yaml.j2 @@ -86,10 +86,10 @@ spec: matchLabels: cluster-role: control-plane image: - checksum: http://imagecache.local:8080/{{ downstream_cluster_image }}.sha256 + checksum: https://imagecache.local:8443/{{ downstream_cluster_image }}.sha256 checksumType: sha256 format: raw - url: http://imagecache.local:8080/{{ downstream_cluster_image }} + url: https://imagecache.local:8443/{{ downstream_cluster_image }} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: Metal3DataTemplate diff --git a/roles/image-cache/defaults/main.yml b/roles/image-cache/defaults/main.yml index 9c2e5ff..a15d98f 100644 --- a/roles/image-cache/defaults/main.yml +++ b/roles/image-cache/defaults/main.yml @@ -1,2 +1,4 @@ working_dir: "{{ lookup('env', 'HOME') }}/metal3-demo-files" image_cache_dir: "{{ working_dir }}/image-cache" +image_cache_conf_dir: "{{ working_dir }}/image-cache-conf" +image_cache_https: true diff --git a/roles/image-cache/files/httpd.conf b/roles/image-cache/files/httpd.conf new file mode 100644 index 0000000..034c676 --- /dev/null +++ b/roles/image-cache/files/httpd.conf @@ -0,0 +1,551 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/usr/local/apache2" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule mpm_event_module modules/mod_mpm_event.so +#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule isapi_module modules/mod_isapi.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule bucketeer_module modules/mod_bucketeer.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule example_hooks_module modules/mod_example_hooks.so +#LoadModule case_filter_module modules/mod_case_filter.so +#LoadModule case_filter_in_module modules/mod_case_filter_in.so +#LoadModule example_ipc_module modules/mod_example_ipc.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule brotli_module modules/mod_brotli.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +#LoadModule lua_module modules/mod_lua.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +LoadModule ssl_module modules/mod_ssl.so +#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so +#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so +#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so +#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule md_module modules/mod_md.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +#LoadModule rewrite_module modules/mod_rewrite.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User www-data +Group www-data + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/usr/local/apache2/htdocs" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog /proc/self/fd/2 + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + CustomLog /proc/self/fd/1 common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + diff --git a/roles/image-cache/tasks/main.yml b/roles/image-cache/tasks/main.yml index cdd9605..35b70b5 100644 --- a/roles/image-cache/tasks/main.yml +++ b/roles/image-cache/tasks/main.yml @@ -74,6 +74,62 @@ vars: eib_source_image: "{{ image_cache_dir }}/{{ os_image_name }}" +### Set up the image-cache webserver ### + +- name: Create image-cache conf directory + file: + path: "{{ image_cache_conf_dir }}" + state: directory + mode: '0700' + +- name: Create config file for image-cache server + copy: + src: httpd.conf + dest: "{{ image_cache_conf_dir }}/httpd.conf" + +- name: Create CA private key for image-cache server + community.crypto.openssl_privatekey: + path: "{{ image_cache_conf_dir }}/ca-certificate.key" + +- name: Create certificate signing request (CSR) for CA certificate + community.crypto.openssl_csr_pipe: + privatekey_path: "{{ image_cache_conf_dir }}/ca-certificate.key" + common_name: metal3-demo CA + use_common_name_for_san: false # since we do not specify SANs, don't use CN as a SAN + basic_constraints: + - 'CA:TRUE' + basic_constraints_critical: true + key_usage: + - keyCertSign + key_usage_critical: true + register: ca_csr + +- name: Create self-signed CA certificate from CSR + community.crypto.x509_certificate: + path: "{{ image_cache_conf_dir }}/ca-certificate.pem" + csr_content: "{{ ca_csr.csr }}" + privatekey_path: "{{ image_cache_conf_dir }}/ca-certificate.key" + provider: selfsigned + +- name: Create private key for image-cache server certificate + community.crypto.openssl_privatekey: + path: "{{ image_cache_conf_dir }}/server.key" + +- name: Create certificate signing request (CSR) for image-cache server certificate + community.crypto.openssl_csr_pipe: + privatekey_path: "{{ image_cache_conf_dir }}/server.key" + subject_alt_name: + - "DNS:imagecache.local" + register: csr + +- name: Generate cert for image-cache server + community.crypto.x509_certificate: + path: "{{ image_cache_conf_dir }}/server.crt" + csr_content: "{{ csr.csr }}" + ownca_path: "{{ image_cache_conf_dir }}/ca-certificate.pem" + ownca_privatekey_path: "{{ image_cache_conf_dir }}/ca-certificate.key" + provider: ownca + - name: Run image-cache webserver container become: true containers.podman.podman_container: @@ -81,10 +137,15 @@ image: docker.io/library/httpd:2.4 volumes: - "{{ image_cache_dir }}:/usr/local/apache2/htdocs" + - "{{ image_cache_conf_dir }}/httpd.conf:/usr/local/apache2/conf/httpd.conf" + - "{{ image_cache_conf_dir }}/server.key:/usr/local/apache2/conf/server.key" + - "{{ image_cache_conf_dir }}/server.crt:/usr/local/apache2/conf/server.crt" detach: true exposed_ports: - 80 + - 443 ports: - 8080:80 + - 8443:443 state: started - force_restart: true + recreate: true diff --git a/roles/metal3/defaults/main.yml b/roles/metal3/defaults/main.yml index a1f19b8..bb2319d 100644 --- a/roles/metal3/defaults/main.yml +++ b/roles/metal3/defaults/main.yml @@ -1,7 +1,9 @@ --- metal3_repo_url: https://github.com/suse-edge/charts.git metal3_branch: main -metal3_chart_version: 0.6.5 + +metal3_chart_version: 0.7.2 metal3_namespace: metal3-system working_dir: "{{ lookup('env', 'HOME') }}/metal3-demo-files" +image_cache_conf_dir: "{{ working_dir }}/image-cache-conf" diff --git a/roles/metal3/tasks/main.yml b/roles/metal3/tasks/main.yml index 3b70d55..981c948 100644 --- a/roles/metal3/tasks/main.yml +++ b/roles/metal3/tasks/main.yml @@ -7,6 +7,17 @@ repo_branch: "{{ metal3_branch }}" repo_pull_request: "{{ metal3_pull_request | default('') }}" +- name: Template manifest for additional CA cert + template: + src: tls-ca-additional.yaml.j2 + dest: "{{ working_dir }}/tls-ca-additional.yaml" + vars: + additional_ca_cert: "{{ lookup('ansible.builtin.file', image_cache_conf_dir + '/ca-certificate.pem') }}" + +- name: Apply manifest for additional CA cert + command: + cmd: kubectl apply -f "{{ working_dir }}/tls-ca-additional.yaml" + - name: Create metal3 overrides yaml file template: src: "metal3-values.yaml.j2" diff --git a/roles/metal3/templates/metal3-values.yaml.j2 b/roles/metal3/templates/metal3-values.yaml.j2 index 213e1d6..445dc09 100644 --- a/roles/metal3/templates/metal3-values.yaml.j2 +++ b/roles/metal3/templates/metal3-values.yaml.j2 @@ -1,5 +1,7 @@ global: ironicIP: {{ management_cluster_ironic_ip | default('192.168.125.10') }} + # Mounts tls-ca-additional Secret + additionalTrustedCAs: true metal3-mariadb: persistence: diff --git a/roles/metal3/templates/tls-ca-additional.yaml.j2 b/roles/metal3/templates/tls-ca-additional.yaml.j2 new file mode 100644 index 0000000..33a1e46 --- /dev/null +++ b/roles/metal3/templates/tls-ca-additional.yaml.j2 @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: {{ metal3_namespace }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: tls-ca-additional + namespace: {{ metal3_namespace }} +type: Opaque +data: + ca-additional.crt: {{ additional_ca_cert | b64encode }} + From 06cf3a48a429e9b6c6f73b84dfe41da5607fc3e9 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 6 Jun 2024 19:29:29 +0300 Subject: [PATCH 2/3] Don't run ansible against management cluster directly This previously seemed to work, but with the latest Leap Micro build there are python dependency issues, so instead only run the the hypervisor host and copy the kubeconfig via ssh --- playbooks/setup_management_cluster.yml | 27 ++++++++------------------ 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/playbooks/setup_management_cluster.yml b/playbooks/setup_management_cluster.yml index 2ce745e..f647383 100644 --- a/playbooks/setup_management_cluster.yml +++ b/playbooks/setup_management_cluster.yml @@ -18,33 +18,22 @@ debug: msg: "Login to the management-cluster vm with 'ssh {{ vm_user }}@{{ management_cluster_public_ip }}'" - - name: Define management-cluster node - ansible.builtin.add_host: - ansible_python_interpreter: "{{ vm_python_interpreter | default('/usr/bin/python3') }}" - name: management-cluster - hostname: management-cluster - ansible_user: "{{ vm_user }}" - ansible_host: "{{ management_cluster_public_ip }}" - groups: - - "{{ management_clusterhost_group | default('management_cluster_group') }}" - -- hosts: management-cluster - tasks: - name: Create .kube file: path: ~/.kube state: directory + # TODO - there's likely a better way to do this... - name: Fetch kubeconfig from management cluster - become: true - fetch: - src: /etc/rancher/rke2/rke2.yaml - flat: true + command: + cmd: "ssh -o StrictHostKeyChecking=no {{ vm_user }}@{{ management_cluster_public_ip }} sudo cat /etc/rancher/rke2/rke2.yaml" + register: kubeconfig + + - name: Write ~/.kube/config locally + copy: + content: "{{ kubeconfig.stdout }}" dest: ~/.kube/config -- hosts: localhost - connection: local - tasks: - name: Update IP in kubeconfig replace: path: ~/.kube/config From 959f4462ace3c05b1f0c3b313773d52c73b07633 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 21 Jun 2024 17:04:55 +0300 Subject: [PATCH 3/3] Pin local-path-provisioner version Use the latest released version, intead of main --- roles/local-path-provisioner/defaults/main.yml | 2 +- roles/local-path-provisioner/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/local-path-provisioner/defaults/main.yml b/roles/local-path-provisioner/defaults/main.yml index 294b7e9..59c75a7 100644 --- a/roles/local-path-provisioner/defaults/main.yml +++ b/roles/local-path-provisioner/defaults/main.yml @@ -1,6 +1,6 @@ --- local_path_provisioner_repo_url: https://github.com/rancher/local-path-provisioner.git -local_path_provisioner_branch: master +local_path_provisioner_version: "v0.0.28" local_path_provisioner_namespace: local-path-storage local_path_provisioner_release: local-path-provisioner diff --git a/roles/local-path-provisioner/tasks/main.yml b/roles/local-path-provisioner/tasks/main.yml index 31561a2..41d69ad 100644 --- a/roles/local-path-provisioner/tasks/main.yml +++ b/roles/local-path-provisioner/tasks/main.yml @@ -6,7 +6,7 @@ vars: repo_dir: local-path-provisioner repo_url: "{{ local_path_provisioner_repo_url }}" - repo_branch: "{{ local_path_provisioner_branch }}" + repo_branch: "{{ local_path_provisioner_version }}" repo_pull_request: "{{ local_path_provisioner_pull_request | default('') }}" - name: Deploy local-path-provisioner via helm