Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(helmfile): add some idempotence to hooks #1761

Merged
merged 2 commits into from
Feb 10, 2025
Merged

fix(helmfile): add some idempotence to hooks #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b9c035
fix(helmfile): add some idempotence
onedr0p Feb 10, 2025
0637b17
Update prometheus-operator-crds.sh.j2
onedr0p Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions templates/config/kubernetes/bootstrap/apps/hooks/cilium-config.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
#!/usr/bin/env bash

wait_for_cilium_crds() {
local crds=(
set -euo pipefail

function wait_for_crds() {
local -r crds=(
"ciliuml2announcementpolicies.cilium.io"
"ciliumbgppeeringpolicies.cilium.io"
"ciliumloadbalancerippools.cilium.io"
)

for crd in "${crds[@]}"; do
until kubectl get crd "$crd" &>/dev/null; do
echo "Waiting for CRD '${crd}'..."
sleep 5
done
done
}

apply_cilium_config() {
kubectl apply \
function apply_config() {
echo "Checking if Cilium config needs to be applied..."
if kubectl diff \
--namespace=kube-system \
--server-side \
--field-manager=kustomize-controller \
--kustomize \
"${KUBERNETES_DIR}/apps/kube-system/cilium/config"
"${KUBERNETES_DIR}/apps/kube-system/cilium/config" &>/dev/null;
then
echo "Cilium config is up to date. Skipping..."
else
echo "Applying Cilium config..."
kubectl apply \
--namespace=kube-system \
--server-side \
--field-manager=kustomize-controller \
--kustomize \
"${KUBERNETES_DIR}/apps/kube-system/cilium/config"
fi
}

main() {
wait_for_cilium_crds
apply_cilium_config
function main() {
wait_for_crds
apply_config
}

main
main "$@"
25 changes: 16 additions & 9 deletions templates/config/kubernetes/bootstrap/apps/hooks/prometheus-operator-crds.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/usr/bin/env bash

set -euo pipefail

# renovate: datasource=github-releases depName=prometheus-operator/prometheus-operator
PROMETHEUS_OPERATOR_VERSION="v0.80.0"

apply_prometheus_operator_crds() {
local crds=(
function apply_crds() {
local -r crds=(
"alertmanagerconfigs"
"alertmanagers"
"podmonitors"
Expand All @@ -18,15 +20,20 @@ apply_prometheus_operator_crds() {
)

for crd in "${crds[@]}"; do
kubectl apply \
--server-side \
--filename \
"https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROMETHEUS_OPERATOR_VERSION}/example/prometheus-operator-crd/monitoring.coreos.com_${crd}.yaml"
if kubectl get crd "${crd}.monitoring.coreos.com" &>/dev/null; then
echo "The CRD '${crd}' already exists. Skipping..."
else
echo "Applying CRD '${crd}'..."
kubectl apply \
--server-side \
--filename \
"https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROMETHEUS_OPERATOR_VERSION}/example/prometheus-operator-crd/monitoring.coreos.com_${crd}.yaml"
fi
done
}

main() {
apply_prometheus_operator_crds
function main() {
apply_crds
}

main
main "$@"