Commit prometheus-operator CRDs (#286)

Co-authored-by: ArthurSens <[email protected]>

Author: vulkoingim

.gitignore

@@ -12,3 +12,4 @@ diff
 !monitoring-satellite/manifests/kubescape/*
 !monitoring-satellite/manifests/probers/*
 !monitoring-satellite/manifests/kube-prometheus-rules/*
+!monitoring-satellite/manifests/crds/*

.pre-commit-config.yaml

@@ -44,4 +44,4 @@ repos:
         language: golang
         pass_filenames: false
 
-exclude: (^vendor|^hack\/deploy-.*)
+exclude: (^vendor|^hack\/deploy-.*|^monitoring-satellite\/manifests\/)

hack/deploy-crds.sh

@@ -23,13 +23,7 @@ if [[ $KUBECONFIG != "" ]]; then
   KUBECONFIG_FLAG="--kubeconfig ${KUBECONFIG}"
 fi
 
-# shellcheck disable=SC2044
-for CRD in $(find monitoring-satellite/manifests/prometheusOperator/ -type f -name "*CustomResourceDefinition.yaml");
-do
-  kubectl $KUBECONFIG_FLAG replace -f $CRD || kubectl $KUBECONFIG_FLAG create -f $CRD
-done
+kubectl $KUBECONFIG_FLAG apply -f monitoring-satellite/manifests/crds/ --server-side
 
 until kubectl $KUBECONFIG_FLAG get servicemonitors.monitoring.coreos.com --all-namespaces ; do date; sleep 1; echo ""; done
 until kubectl $KUBECONFIG_FLAG get prometheusrules.monitoring.coreos.com --all-namespaces ; do date; sleep 1; echo ""; done
-
-kubectl $KUBECONFIG_FLAG apply -f monitoring-satellite/manifests/pyrra/crd.yaml

hack/prepare-kind.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
 
 # shellcheck disable=SC2230
-if [[ $(which kind) != 0  ]]; then
-    # shellcheck disable=SC2016
-    echo 'kind not available in $PATH, installing latest kind'
-    # Install latest kind
-    curl -s https://api.github.com/repos/kubernetes-sigs/kind/releases/latest \
-    | grep "browser_download_url.*kind-linux-amd64" \
-    | cut -d : -f 2,3 \
-    | tr -d \" \
-    | wget -qi -
-    sudo mv kind-linux-amd64 /usr/bin/kind && sudo chmod +x /usr/bin/kind
-    rm -f kind-linux-amd64*
+if ! command -v kind; then
+  # shellcheck disable=SC2016
+  echo 'kind not available in $PATH, installing latest kind'
+  # Install latest kind
+  curl -s https://api.github.com/repos/kubernetes-sigs/kind/releases/latest |
+    grep "browser_download_url.*kind-linux-amd64" |
+    cut -d : -f 2,3 |
+    tr -d \" |
+    wget -qi -
+  sudo mv kind-linux-amd64 /usr/bin/kind && sudo chmod +x /usr/bin/kind
+  rm -f kind-linux-amd64*
 fi
 
 cluster_created=$(kind get clusters 2>&1)
 if [[ "$cluster_created" == "No kind clusters found." ]]; then
-    kind create cluster --config "${PWD}"/.github/workflows/kind/config.yml
+  kind create cluster --config "${PWD}"/.github/workflows/kind/config.yml
 else
-    echo "Cluster ${cluster_created} already present"
+  echo "Cluster ${cluster_created} already present"
 fi

installer/pkg/config/config.go

@@ -29,10 +29,6 @@ func Defaults(in interface{}) error {
 		Install: false,
 	}
 
-	cfg.Prometheus = &Prometheus{
-		RemoteWrite: []*RemoteWrite{},
-	}
-
 	cfg.Pyrra = &Pyrra{
 		Install: false,
 	}