taking away metrics server health checks and failure debug

Signed-off-by: Austin Abro <[email protected]>
zarf-dev · Sep 18, 2024 · 52e1989 · 52e1989
1 parent b0f79ba
commit 52e1989
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 264 deletions.
diff --git a/.../bb-generate/manifests/gitrepository.yaml → ...-generate/manifests/bb-gitrepository.yaml b/.../bb-generate/manifests/gitrepository.yaml → ...-generate/manifests/bb-gitrepository.yaml
diff --git a/...es/bb-generate/manifests/helmrelease.yaml → ...bb-generate/manifests/bb-helmrelease.yaml b/...es/bb-generate/manifests/helmrelease.yaml → ...bb-generate/manifests/bb-helmrelease.yaml
diff --git a/examples/bb-generate/zarf.yaml b/examples/bb-generate/zarf.yaml
@@ -1,165 +1,139 @@
-# zarf dev generate big-bang 2.35.0 --values-files=values-files/ingress.yaml,values-files/kyverno.yaml,values-files/loki.yaml,values-files/neuvector.yaml
 apiVersion: zarf.dev/v1alpha1
 kind: ZarfPackageConfig
 metadata:
   name: bigbang
 components:
-- name: flux
-  required: true
-  manifests:
-  - name: flux-system
-    namespace: flux-system
-    files:
-    - flux/bb-flux.yaml
-  images:
-  - registry1.dso.mil/ironbank/fluxcd/source-controller:v1.3.0
-  - registry1.dso.mil/ironbank/fluxcd/kustomize-controller:v1.3.0
-  - registry1.dso.mil/ironbank/fluxcd/helm-controller:v1.0.1
-  - registry1.dso.mil/ironbank/fluxcd/notification-controller:v1.3.0
-- name: bigbang
-  required: true
-  manifests:
+  - name: flux
+    required: true
+    manifests:
+      - name: flux-system
+        namespace: flux-system
+        files:
+          - flux/bb-flux.yaml
+    images:
+      - registry1.dso.mil/ironbank/fluxcd/source-controller:v1.3.0
+      - registry1.dso.mil/ironbank/fluxcd/kustomize-controller:v1.3.0
+      - registry1.dso.mil/ironbank/fluxcd/helm-controller:v1.0.1
+      - registry1.dso.mil/ironbank/fluxcd/notification-controller:v1.3.0
   - name: bigbang
-    namespace: bigbang
-    files:
-    - manifests/gitrepository.yaml
-    - manifests/bb-zarf-credentials.yaml
-    - values-files/ingress.yaml
-    - values-files/kyverno.yaml
-    - values-files/loki.yaml
-    - values-files/neuvector.yaml
-    - manifests/helmrelease.yaml
-  images:
-  - registry1.dso.mil/ironbank/big-bang/grafana/grafana-plugins:11.1.4
-  - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.5
-  - registry1.dso.mil/ironbank/big-bang/base:2.1.0
-  - registry1.dso.mil/ironbank/opensource/istio/pilot:1.22.4
-  - registry1.dso.mil/ironbank/opensource/istio/proxyv2:1.22.4
-  - registry1.dso.mil/ironbank/opensource/istio/operator:1.22.4
-  - registry1.dso.mil/ironbank/opensource/kiali/kiali:v1.89.0
-  - registry1.dso.mil/ironbank/opensource/kiali/kiali-operator:v1.89.1
-  - registry1.dso.mil/ironbank/opensource/kyverno:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kyverno/kyvernopre:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.29.7
-  - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
-  - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/reports-controller:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/background-controller:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/cleanup-controller:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kyverno/kyvernocli:v1.12.5
-  - registry1.dso.mil/ironbank/opensource/kyverno/policy-reporter:2.20.1
-  - registry1.dso.mil/ironbank/opensource/grafana/loki:3.1.1
-  - registry1.dso.mil/ironbank/opensource/kubernetes-sigs/metrics-server:v0.7.1
-  - registry1.dso.mil/ironbank/opensource/prometheus/alertmanager:v0.27.0
-  - registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.29.6
-  - registry1.dso.mil/ironbank/opensource/kubernetes/kube-state-metrics:v2.12.0
-  - registry1.dso.mil/ironbank/opensource/ingress-nginx/kube-webhook-certgen:v1.3.0
-  - registry1.dso.mil/ironbank/opensource/prometheus/prometheus:v2.53.0
-  - registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.75.0
-  - registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.75.0
-  - registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.8.1
-  - registry1.dso.mil/ironbank/opensource/thanos/thanos:v0.35.1
-  - registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.3.4
-  - registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.3.4
-  - registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.3.4
-  - registry1.dso.mil/ironbank/neuvector/neuvector/scanner:5
-  - registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
-  - registry1.dso.mil/ironbank/opensource/grafana/promtail:v3.0.0
-  - registry1.dso.mil/ironbank/opensource/grafana/tempo:2.5.0
-  - registry1.dso.mil/ironbank/opensource/grafana/tempo-query:2.5.0
-  repos:
-  - https://repo1.dso.mil/big-bang/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  - https://repo1.dso.mil/big-bang/product/packages/[email protected]
-  actions:
-    onDeploy:
-      onFailure:
-      - cmd: ./zarf tools kubectl get nodes -o wide
-      - cmd: ./zarf tools kubectl get hr -n bigbang
-      - cmd: ./zarf tools kubectl get gitrepo -n bigbang
-      - cmd: ./zarf tools kubectl get pods -A
-      - mute: true
-        cmd: ./zarf tools kubectl describe hr -n bigbang
-        description: Storing debug information to the log for troubleshooting.
-      - mute: true
-        cmd: ./zarf tools kubectl describe gitrepo -n bigbang
-        description: Storing debug information to the log for troubleshooting.
-      - mute: true
-        cmd: ./zarf tools kubectl describe pods -A
-        description: Storing debug information to the log for troubleshooting.
-      - mute: true
-        cmd: ./zarf tools kubectl describe nodes
-        description: Storing debug information to the log for troubleshooting.
-      - mute: true
-        cmd: ./zarf tools kubectl get events -A
-        description: Storing debug information to the log for troubleshooting.
-    onRemove:
-      before:
-      - cmd: ./zarf tools kubectl patch helmrelease -n bigbang bigbang --type=merge -p '{"spec":{"suspend":true}}'
-        description: Suspend Big Bang HelmReleases to prevent reconciliation during removal.
-  healthChecks:
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: grafana
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: istio
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: istio-operator
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: kiali
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: kyverno
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: kyverno-policies
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: kyverno-reporter
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: loki
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: metrics-server
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: monitoring
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: neuvector
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: promtail
-  - apiVersion: v1
-    kind: HelmRelease
-    namespace: bigbang
-    name: tempo
+    required: true
+    manifests:
+      - name: bigbang
+        namespace: bigbang
+        files:
+          - manifests/bb-gitrepository.yaml
+          - manifests/bb-zarf-credentials.yaml
+          - values-files/ingress.yaml
+          - values-files/kyverno.yaml
+          - values-files/loki.yaml
+          - values-files/neuvector.yaml
+          - manifests/bb-helmrelease.yaml
+    images:
+      - registry1.dso.mil/ironbank/big-bang/grafana/grafana-plugins:11.1.4
+      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.5
+      - registry1.dso.mil/ironbank/big-bang/base:2.1.0
+      - registry1.dso.mil/ironbank/opensource/istio/pilot:1.22.4
+      - registry1.dso.mil/ironbank/opensource/istio/proxyv2:1.22.4
+      - registry1.dso.mil/ironbank/opensource/istio/operator:1.22.4
+      - registry1.dso.mil/ironbank/opensource/kiali/kiali:v1.89.0
+      - registry1.dso.mil/ironbank/opensource/kiali/kiali-operator:v1.89.1
+      - registry1.dso.mil/ironbank/opensource/kyverno:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kyverno/kyvernopre:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.29.7
+      - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
+      - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/reports-controller:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/background-controller:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kyverno/kyverno/cleanup-controller:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kyverno/kyvernocli:v1.12.5
+      - registry1.dso.mil/ironbank/opensource/kyverno/policy-reporter:2.20.1
+      - registry1.dso.mil/ironbank/opensource/grafana/loki:3.1.1
+      - registry1.dso.mil/ironbank/opensource/kubernetes-sigs/metrics-server:v0.7.1
+      - registry1.dso.mil/ironbank/opensource/prometheus/alertmanager:v0.27.0
+      - registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.29.6
+      - registry1.dso.mil/ironbank/opensource/kubernetes/kube-state-metrics:v2.12.0
+      - registry1.dso.mil/ironbank/opensource/ingress-nginx/kube-webhook-certgen:v1.3.0
+      - registry1.dso.mil/ironbank/opensource/prometheus/prometheus:v2.53.0
+      - registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.75.0
+      - registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.75.0
+      - registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.8.1
+      - registry1.dso.mil/ironbank/opensource/thanos/thanos:v0.35.1
+      - registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.3.4
+      - registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.3.4
+      - registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.3.4
+      - registry1.dso.mil/ironbank/neuvector/neuvector/scanner:5
+      - registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
+      - registry1.dso.mil/ironbank/opensource/grafana/promtail:v3.0.0
+      - registry1.dso.mil/ironbank/opensource/grafana/tempo:2.5.0
+      - registry1.dso.mil/ironbank/opensource/grafana/tempo-query:2.5.0
+    repos:
+      - https://repo1.dso.mil/big-bang/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+      - https://repo1.dso.mil/big-bang/product/packages/[email protected]
+    actions:
+      onRemove:
+        before:
+          - cmd: ./zarf tools kubectl patch helmrelease -n bigbang bigbang --type=merge -p '{"spec":{"suspend":true}}'
+            description: Suspend Big Bang HelmReleases to prevent reconciliation during removal.
+    healthChecks:
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: grafana
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: istio
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: istio-operator
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: kiali
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: kyverno
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: kyverno-policies
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: kyverno-reporter
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: loki
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: monitoring
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: neuvector
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: promtail
+      - apiVersion: v1
+        kind: HelmRelease
+        namespace: bigbang
+        name: tempo
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/src/cmd/dev.go b/src/cmd/dev.go
@@ -108,6 +108,7 @@ var bigBangGenerateCommand = &cobra.Command{
 	Example: "zarf dev generate big-bang 2.3.4 --values-file-manifests=my-configmap.yaml,my-secret.yaml",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		bbOpts.Version = args[0]
+		bbOpts.BaseDir = "."
 		return bigbang.Create(cmd.Context(), bbOpts)
 	},
 }