diff --git a/apps/guacamole/manifests/envoy-route.yaml b/apps/guacamole/manifests/envoy-route.yaml deleted file mode 100644 index 2d9dbe2..0000000 --- a/apps/guacamole/manifests/envoy-route.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: guacamole - namespace: guacamole -spec: - parentRefs: - - name: edge - namespace: gateway - sectionName: https - hostnames: - - guacamole.kube.huskypup.net - rules: - - matches: - - path: - type: PathPrefix - value: /guacamole - filters: - - type: URLRewrite - urlRewrite: - path: - type: ReplacePrefixMatch - replacePrefixMatch: / - backendRefs: - - name: guacamole - port: 8080 - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - name: guacamole - port: 8080 diff --git a/argocd-apps/projects.yaml b/argocd-apps/projects.yaml index 064dd6f..eeed544 100644 --- a/argocd-apps/projects.yaml +++ b/argocd-apps/projects.yaml @@ -49,6 +49,8 @@ spec: server: https://kubernetes.default.svc - namespace: istio-system server: https://kubernetes.default.svc + - namespace: nessus + server: https://kubernetes.default.svc clusterResourceWhitelist: - group: '*' kind: '*' diff --git a/charts/prometheus-operator-crds/Chart.yaml b/charts/prometheus-operator-crds/Chart.yaml index 019053f..a79e9e0 100644 --- a/charts/prometheus-operator-crds/Chart.yaml +++ b/charts/prometheus-operator-crds/Chart.yaml @@ -3,4 +3,4 @@ name: prometheus-operator-crds description: Prometheus Operator CRDs installation type: application version: 1.0.0 -appVersion: "v0.76.0" +appVersion: "v0.89.0" diff --git a/charts/prometheus-operator-crds/templates/job.yaml b/charts/prometheus-operator-crds/templates/job.yaml index d997629..cc130e5 100644 --- a/charts/prometheus-operator-crds/templates/job.yaml +++ b/charts/prometheus-operator-crds/templates/job.yaml @@ -37,7 +37,7 @@ spec: set -e echo "Installing Prometheus Operator CRDs..." - PROM_OPERATOR_VERSION="v0.76.0" + PROM_OPERATOR_VERSION="v0.89.0" kubectl apply --server-side -f "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROM_OPERATOR_VERSION}/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml" kubectl apply --server-side -f "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROM_OPERATOR_VERSION}/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml" diff --git a/scripts/argocd-add-hostaliases.sh b/scripts/argocd-add-hostaliases.sh new file mode 100755 index 0000000..44b7d30 --- /dev/null +++ b/scripts/argocd-add-hostaliases.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# argocd-add-hostaliases.sh +# Add hostAliases to ArgoCD server for Authentik OIDC + +set -euo pipefail + +echo "=== Adding hostAliases to ArgoCD server ===" + +NS=argocd +EDGE_IP=$(kubectl get svc -n istio-system istio-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + +echo "Istio edge gateway IP: $EDGE_IP" + +if kubectl get deployment argocd-server -n "${NS}" -o jsonpath='{.spec.template.spec.hostAliases}' | grep -q "${EDGE_IP}"; then + echo "✅ argocd-server already has hostAliases configured" +else + echo "Adding hostAliases to argocd-server..." + kubectl patch deployment argocd-server -n "${NS}" --type='json' -p="[{\"op\": \"add\", \"path\": \"/spec/template/spec/hostAliases\", \"value\": [{\"ip\": \"${EDGE_IP}\", \"hostnames\": [\"auth.kube.huskypup.net\"]}]}]" + echo "✅ hostAliases added to argocd-server" +fi + +echo "" +echo "=== hostAliases configuration complete ===" +echo "ArgoCD will now route auth.kube.huskypup.net through Istio edge gateway (${EDGE_IP})" +echo "This ensures proper SSL certificate validation for Authentik OIDC"