-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add systemd services for configuration after start
the services does the various needed tasks to setup the ocp or microshift cluster, these systemd units runs small shell scripts which are based on: https://github.com/crc-org/crc-cloud/blob/main/pkg/bundle/setup/clustersetup.sh and does the following tasks: - creates crc specific configurations for dnsmasq - sets a new uuid as cluster id - creates the pod for routes-controller - tries to grow the disk and filesystem - checks if the cluster operators are ready - adds the pull secret to the cluster - sets kubeadmin and developer user passwords - sets a custom ca for authentication - sets custom nip.io cluster domain
- Loading branch information
Showing
25 changed files
with
422 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Self sufficient bundles | ||
|
||
Since release 4.19.0 of OpenShift Local, the bundles generated by `snc` contain additional systemd services to provision the cluster and remove the need for | ||
an outside entity to provision the cluster, although an outside process needs to create some files on pre-defined locations inside the VM for the systemd | ||
services to do their work. | ||
|
||
## The following table lists the systemd services and the location of files they need to provision the cluster, users of SNC need to create those files | ||
|
||
| Systemd unit | Runs for (ocp, MicroShift, both) | Input files location | Marker env variables | | ||
| :----------------------------: | :------------------------------: | :----------------------------------: | :------------------: | | ||
| `crc-cluster-status.service` | both | none | none | | ||
| `crc-pullsecret.service` | both | /opt/crc/pull-secret | none | | ||
| `crc-dnsmasq.service` | both | none | none | | ||
| `crc-routes-controller.service`| both | none | none | | ||
| `ocp-cluster-ca.service` | ocp | /opt/crc/custom-ca.crt | CRC_CLOUD=1 | | ||
| `ocp-clusterid.service` | ocp | none | none | | ||
| `ocp-custom-domain.service` | ocp | none | CRC_CLOUD=1 | | ||
| `ocp-growfs.service` | ocp | none | none | | ||
| `ocp-userpasswords.service` | ocp | /opt/crc/pass_{kubeadmin, developer} | none | | ||
|
||
In addition to the above services we have `ocp-cluster-ca.path`, `crc-pullsecret.path` and `ocp-userpasswords.path` that monitors the filesystem paths | ||
related to their `*.service` counterparts and starts the service when the paths become available. | ||
|
||
> [!NOTE] | ||
> "Marker env variable" is set using an env file, if the required env variable is not set then unit is skipped | ||
> some units are run only when CRC_CLOUD=1 is set, these are only needed when using the bundles with crc-cloud | ||
The systemd services are heavily based on the [`clustersetup.sh`](https://github.com/crc-org/crc-cloud/blob/main/pkg/bundle/setup/clustersetup.sh) script found in the `crc-cloud` project. | ||
|
||
## Naming convention for the systemd unit files | ||
|
||
Systemd units that are needed for both 'OpenShift' and 'MicroShift' are named as `crc-*.service`, units that are needed only for 'OpenShift' are named | ||
as `ocp-*.service` and when we add units that are only needed for 'MicroShift' they should be named as `ucp-*.service` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[Unit] | ||
Description=CRC Unit checking if cluster is ready | ||
After=kubelet.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/crc-cluster-status.sh | ||
RemainAfterExit=true | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
export KUBECONFIG=/opt/kubeconfig | ||
|
||
function check_cluster_healthy() { | ||
WAIT="authentication|console|etcd|ingress|openshift-apiserver" | ||
|
||
until `oc get co > /dev/null 2>&1` | ||
do | ||
sleep 2 | ||
done | ||
|
||
for i in $(oc get co | grep -P "$WAIT" | awk '{ print $3 }') | ||
do | ||
if [[ $i == "False" ]] | ||
then | ||
return 1 | ||
fi | ||
done | ||
return 0 | ||
} | ||
|
||
# rm -rf /tmp/.crc-cluster-ready | ||
|
||
COUNTER=0 | ||
CLUSTER_HEALTH_SLEEP=8 | ||
CLUSTER_HEALTH_RETRIES=500 | ||
|
||
while ! check_cluster_healthy | ||
do | ||
sleep $CLUSTER_HEALTH_SLEEP | ||
if [[ $COUNTER == $CLUSTER_HEALTH_RETRIES ]] | ||
then | ||
return 1 | ||
fi | ||
((COUNTER++)) | ||
done | ||
|
||
# need to set a marker to let `crc` know the cluster is ready | ||
# touch /tmp/.crc-cluster-ready | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[Unit] | ||
Description=CRC Unit for configuring dnsmasq | ||
Requires=sys-class-net-tap0.device | ||
After=sys-class-net-tap0.device | ||
After=network-online.target ovs-configuration.service gvisor-tap-vsock.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecCondition=/usr/bin/bash -c "/usr/sbin/ip link show dev tap0 && exit 1 || exit 0" | ||
ExecStart=/usr/local/bin/crc-dnsmasq.sh | ||
ExecStartPost=/usr/bin/systemctl start dnsmasq.service | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
hostName=$(hostname) | ||
hostIp=$(hostname --all-ip-addresses | awk '{print $1}') | ||
|
||
cat << EOF > /etc/dnsmasq.d/crc-dnsmasq.conf | ||
interface=br-ex | ||
expand-hosts | ||
log-queries | ||
local=/crc.testing/ | ||
domain=crc.testing | ||
address=/apps-crc.testing/192.168.130.11 | ||
address=/api.crc.testing/192.168.130.11 | ||
address=/api-int.crc.testing/192.168.130.11 | ||
address=/$hostName.crc.testing/$hostIp | ||
EOF | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[Unit] | ||
Description=CRC Unit for monitoring the pull secret path | ||
After=kubelet.service | ||
|
||
[Path] | ||
PathExists=/opt/crc/pull-secret | ||
TriggerLimitIntervalSec=1min | ||
TriggerLimitBurst=0 | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[Unit] | ||
Description=CRC Unit for adding pull secret to cluster | ||
After=kubelet.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/crc-pullsecret.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
source /usr/local/bin/crc-systemd-common.sh | ||
export KUBECONFIG="/opt/kubeconfig" | ||
|
||
wait_for_resource secret | ||
|
||
# check if existing pull-secret is valid if not add the one from /opt/crc/pull-secret | ||
existingPsB64=$(oc get secret pull-secret -n openshift-config -o jsonpath="{['data']['\.dockerconfigjson']}") | ||
existingPs=$(echo "${existingPsB64}" | base64 -d) | ||
|
||
echo "${existingPs}" | jq -e '.auths' | ||
|
||
if [[ $? != 0 ]]; then | ||
pullSecretB64=$(cat /opt/crc/pull-secret | base64 -w0) | ||
oc patch secret pull-secret -n openshift-config --type merge -p "{\"data\":{\".dockerconfigjson\":\"${pullSecretB64}\"}}" | ||
rm -f /opt/crc/pull-secret | ||
fi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
[Unit] | ||
Description=CRC Unit starting routes controller | ||
Requires=sys-class-net-tap0.device | ||
After=sys-class-net-tap0.device | ||
After=network-online.target kubelet.service gvisor-tap-vsock.service crc-dnsmasq.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecCondition=/usr/bin/bash -c "/usr/sbin/ip link show dev tap0" | ||
ExecStart=/usr/local/bin/crc-routes-controller.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
source /usr/local/bin/crc-systemd-common.sh | ||
export KUBECONFIG=/opt/kubeconfig | ||
|
||
wait_for_resource pods | ||
|
||
oc apply -f /opt/crc/routes-controller.yaml | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# $1 is the resource to check | ||
# $2 is an optional maximum retry count; default 20 | ||
function wait_for_resource() { | ||
local retry=0 | ||
local max_retry=${2:-20} | ||
until `oc get "$1" > /dev/null 2>&1` | ||
do | ||
[ $retry == $max_retry ] && exit 1 | ||
sleep 5 | ||
((retry++)) | ||
done | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[Unit] | ||
Description=CRC Unit monitoring custom-ca.crt file path | ||
After=kubelet.service | ||
|
||
[Path] | ||
PathExists=/opt/crc/custom-ca.crt | ||
TriggerLimitIntervalSec=1min | ||
TriggerLimitBurst=0 | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[Unit] | ||
Description=CRC Unit setting custom cluster ca | ||
After=kubelet.service ocp-clusterid.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/ocp-cluster-ca.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
source /usr/local/bin/crc-systemd-common.sh | ||
export KUBECONFIG="/opt/kubeconfig" | ||
|
||
wait_for_resource configmap | ||
|
||
custom_ca_path=/opt/crc/custom-ca.crt | ||
|
||
# retry=0 | ||
# max_retry=20 | ||
# until `ls ${custom_ca_path} > /dev/null 2>&1` | ||
# do | ||
# [ $retry == $max_retry ] && exit 1 | ||
# sleep 5 | ||
# ((retry++)) | ||
# done | ||
|
||
oc create configmap client-ca-custom -n openshift-config --from-file=ca-bundle.crt=${custom_ca_path} | ||
oc patch apiserver cluster --type=merge -p '{"spec": {"clientCA": {"name": "client-ca-custom"}}}' | ||
oc create configmap admin-kubeconfig-client-ca -n openshift-config --from-file=ca-bundle.crt=${custom_ca_path} \ | ||
--dry-run -o yaml | oc replace -f - | ||
|
||
rm -f /opt/crc/custom-ca.crt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[Unit] | ||
Description=CRC Unit setting random cluster ID | ||
After=kubelet.service | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/ocp-clusterid.sh | ||
Restart=on-failure | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
source /usr/local/bin/crc-systemd-common.sh | ||
export KUBECONFIG="/opt/kubeconfig" | ||
uuid=$(uuidgen) | ||
|
||
wait_for_resource clusterversion | ||
|
||
oc patch clusterversion version -p "{\"spec\":{\"clusterID\":\"${uuid}\"}}" --type merge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[Unit] | ||
Description=CRC Unit setting nip.io domain for cluster | ||
After=kubelet.service ocp-clusterid.service ocp-cluster-ca.service | ||
|
||
[Service] | ||
Type=oneshot | ||
EnvironmentFile=/opt/crc/crc-cloud | ||
ExecStart=/usr/local/bin/ocp-custom-domain.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
#!/bin/bash | ||
|
||
set -x | ||
|
||
if [ -z $CRC_CLOUD ]; then | ||
echo "Not running in crc-cloud mode" | ||
exit 0 | ||
fi | ||
|
||
source /usr/local/bin/crc-systemd-common.sh | ||
export KUBECONFIG="/opt/kubeconfig" | ||
export EIP=$(hostname -i) | ||
|
||
STEPS_SLEEP_TIME=30 | ||
|
||
wait_for_resource secret | ||
|
||
# create cert and add as secret | ||
openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout nip.key -out nip.crt -subj "/CN=$EIP.nip.io" -addext "subjectAltName=DNS:apps.$EIP.nip.io,DNS:*.apps.$EIP.nip.io,DNS:api.$EIP.nip.io" | ||
oc create secret tls nip-secret --cert=nip.crt --key=nip.key -n openshift-config | ||
sleep $STEPS_SLEEP_TIME | ||
|
||
# patch ingress | ||
cat <<EOF > ingress-patch.yaml | ||
spec: | ||
appsDomain: apps.$EIP.nip.io | ||
componentRoutes: | ||
- hostname: console-openshift-console.apps.$EIP.nip.io | ||
name: console | ||
namespace: openshift-console | ||
servingCertKeyPairSecret: | ||
name: nip-secret | ||
- hostname: oauth-openshift.apps.$EIP.nip.io | ||
name: oauth-openshift | ||
namespace: openshift-authentication | ||
servingCertKeyPairSecret: | ||
name: nip-secret | ||
EOF | ||
oc patch ingresses.config.openshift.io cluster --type=merge --patch-file=ingress-patch.yaml | ||
|
||
# patch API server to use new CA secret | ||
oc patch apiserver cluster --type=merge -p '{"spec":{"servingCerts": {"namedCertificates":[{"names":["api.'$EIP'.nip.io"],"servingCertificate": {"name": "nip-secret"}}]}}}' | ||
|
||
# patch image registry route | ||
oc patch -p '{"spec": {"host": "default-route-openshift-image-registry.'$EIP'.nip.io"}}' route default-route -n openshift-image-registry --type=merge | ||
|
||
#wait_cluster_become_healthy "authentication|console|etcd|ingress|openshift-apiserver" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[Unit] | ||
Description=CRC Unit to grow the root filesystem | ||
|
||
[Service] | ||
Type=oneshot | ||
ExecStart=/usr/local/bin/ocp-growfs.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
Oops, something went wrong.