Skip to content

Commit

Permalink
Clean up dead code and add image specs to values.yaml (#262)
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff McCoy <code@jeffm.us>
  • Loading branch information
RothAndrew authored and jeff-mccoy committed Feb 3, 2022
1 parent 638e7f7 commit 4089195
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 144 deletions.
14 changes: 1 addition & 13 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,8 @@ vm-destroy: ## Cleanup plz
.PHONY: package-examples
package-examples: package-example-big-bang package-example-software-factory package-example-data-injection package-example-game package-example-gitops-data package-example-single-big-bang-package package-example-tiny-kafka package-example-postgres-operator ## Create zarf packages from all examples

.PHONY: vendor-big-bang-base
vendor-big-bang-base: ## Grab the bigbang base kustomization so we don't need to do funky things to let Flux grab it from a private repo
cd big-bang/template/bigbang/vendor && \
rm -rf bigbang && \
git init bigbang && \
cd bigbang && \
git remote add -f origin https://repo1.dso.mil/platform-one/big-bang/bigbang.git && \
git config core.sparseCheckout true && \
echo "base/" > .git/info/sparse-checkout && \
git checkout tags/1.17.0 -b tagbranch && \
rm -rf .git

.PHONY: package-example-big-bang
package-example-big-bang: vendor-big-bang-base ## Create the Big Bang Core example
package-example-big-bang: ## Create the Big Bang Core example
cd big-bang && $(ZARF_BIN) package create --confirm && mv zarf-package-* ../sync/

.PHONY: package-example-softare-factory
Expand Down
23 changes: 0 additions & 23 deletions examples/big-bang/Makefile

This file was deleted.

86 changes: 81 additions & 5 deletions examples/big-bang/kustomizations/bigbang/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ domain: bigbang.dev

registryCredentials:
registry: "###ZARF_REGISTRY###"
username: "zarf-git-user"
password: "${zarf_secret}"
username: "zarf-pull"
password: "###ZARF_REGISTRY_AUTH_PULL###"

git:
existingSecret: "zarf-git-secret"
Expand Down Expand Up @@ -178,6 +178,10 @@ istio:
-----END CERTIFICATE-----
values:
hub: "###ZARF_REGISTRY###/ironbank/opensource/istio"
cni:
image:
hub: "###ZARF_REGISTRY###/ironbank/opensource/istio"
istiod:
hpaSpec:
maxReplicas: 1
Expand All @@ -199,6 +203,7 @@ istiooperator:
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__istio-operator.git
values:
hub: "###ZARF_REGISTRY###/ironbank/opensource/istio"
operator:
resources:
requests:
Expand All @@ -213,6 +218,11 @@ jaeger:
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__jaeger.git
values:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-operator
retention:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-es-index-cleaner:1.24.0

resources:
requests:
cpu: "100m"
Expand All @@ -223,30 +233,37 @@ jaeger:
jaeger:
spec:
allInOne:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/all-in-one:1.24.0
resources:
requests:
cpu: "100m"
memory: "128Mi"
limits:
cpu: "500m"
memory: "128Mi"
agent:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-agent:1.24.0
ingester:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-ingester:1.24.0
query:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-query:1.24.0
collector:
image: ###ZARF_REGISTRY###/ironbank/opensource/jaegertracing/jaeger-collector:1.24.0
resources:
requests:
cpu: "100m"
memory: "128Mi"
limits:
cpu: "500m"
memory: "128Mi"
ingester:
# TODO: Remove this once the upstream bug is fixed (https://repo1.dso.mil/platform-one/big-bang/apps/core/jaeger/-/issues/15)
image: registry1.dso.mil/ironbank/opensource/jaegertracing/jaeger-ingester:1.24.0

kiali:
enabled: true
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__kiali.git
values:
image:
repo: ###ZARF_REGISTRY###/ironbank/opensource/kiali/kiali-operator
resources:
requests:
cpu: "100m"
Expand All @@ -257,19 +274,26 @@ kiali:
cr:
spec:
deployment:
image_name: ###ZARF_REGISTRY###/ironbank/opensource/kiali/kiali
resources:
requests:
cpu: "100m"
memory: "368Mi"
limits:
cpu: "500m"
memory: "368Mi"
svcPatchJob:
image:
repository: ###ZARF_REGISTRY###/ironbank/big-bang/base


clusterAuditor:
enabled: true
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__cluster-auditor.git
values:
image:
repo: ###ZARF_REGISTRY###/ironbank/cluster-auditor/opa-collector
resources:
requests:
cpu: "100m"
Expand All @@ -283,6 +307,16 @@ gatekeeper:
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__policy.git
values:
postInstall:
labelNamespace:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/kubernetes-1.21/kubectl
postUpgrade:
cleanupCRD:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/kubernetes-1.21/kubectl
image:
repository: "###ZARF_REGISTRY###/ironbank/opensource/openpolicyagent/gatekeeper"
replicas: 1
controllerManager:
resources:
Expand All @@ -303,6 +337,8 @@ gatekeeper:
violations:
allowedDockerRegistries:
parameters:
repos:
- ###ZARF_REGISTRY###
excludedResources:
# K3s kube-system stuff, better than excluding the whole namespace
- "kube-system/coredns-.*"
Expand Down Expand Up @@ -339,6 +375,8 @@ logging:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__elasticsearch-kibana.git
values:
elasticsearch:
image:
repository: ###ZARF_REGISTRY###/ironbank/elastic/elasticsearch/elasticsearch
master:
count: 1
persistence:
Expand All @@ -362,6 +400,8 @@ logging:
cpu: "500m"
memory: "3Gi"
kibana:
image:
repository: ###ZARF_REGISTRY###/ironbank/elastic/kibana/kibana
count: 1
resources:
requests:
Expand All @@ -370,17 +410,25 @@ logging:
limits:
memory: "1Gi"
cpu: "500m"
upgradeJob:
image:
repository: ###ZARF_REGISTRY###/ironbank/big-bang/base

eckoperator:
enabled: true
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__eck-operator.git
values:
image:
repository: ###ZARF_REGISTRY###/ironbank/elastic/eck-operator/eck-operator

fluentbit:
enabled: true
git:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__core__fluentbit.git
values:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/fluent/fluent-bit
securityContext:
privileged: true
resources:
Expand All @@ -398,6 +446,8 @@ monitoring:
values:
alertmanager:
alertmanagerSpec:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/prometheus/alertmanager
resources:
requests:
cpu: "100m"
Expand All @@ -406,15 +456,29 @@ monitoring:
cpu: "500m"
memory: "256Mi"
prometheusOperator:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/prometheus-operator/prometheus-operator
resources:
requests:
cpu: "100m"
memory: "512Mi"
limits:
cpu: "500m"
memory: "512Mi"
admissionWebhooks:
patch:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/jet/kube-webhook-certgen
configmapReloadImage:
repository: ###ZARF_REGISTRY###/ironbank/opensource/jimmidyson/configmap-reload
prometheusConfigReloaderImage:
repository: ###ZARF_REGISTRY###/ironbank/opensource/prometheus-operator/prometheus-config-reloader
kubectlImage:
repository: ###ZARF_REGISTRY###/ironbank/opensource/kubernetes-1.20/kubectl-1.20
prometheus:
prometheusSpec:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/prometheus/prometheus
resources:
requests:
cpu: "100m"
Expand All @@ -423,7 +487,11 @@ monitoring:
cpu: "500m"
memory: "2Gi"
grafana:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/grafana/grafana
sidecar:
image:
repository: ###ZARF_REGISTRY###/ironbank/kiwigrid/k8s-sidecar
resources:
requests:
cpu: "50m"
Expand All @@ -438,7 +506,11 @@ monitoring:
limits:
cpu: "500m"
memory: "128Mi"
testFramework:
image: "###ZARF_REGISTRY###/ironbank/opensource/bats/bats"
kube-state-metrics:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/coreos/kube-state-metrics
resources:
requests:
cpu: "10m"
Expand All @@ -447,6 +519,8 @@ monitoring:
cpu: "500m"
memory: "128Mi"
prometheus-node-exporter:
image:
repository: ###ZARF_REGISTRY###/ironbank/opensource/prometheus/node-exporter
resources:
requests:
cpu: "100m"
Expand All @@ -461,6 +535,8 @@ twistlock:
repo: http://zarf-gitea-http.zarf.svc.cluster.local:3000/zarf-git-user/mirror__repo1.dso.mil__platform-one__big-bang__apps__security-tools__twistlock.git
values:
console:
image:
repository: ###ZARF_REGISTRY###/ironbank/twistlock/console/console
persistence:
size: 5Gi
resources:
Expand Down
2 changes: 0 additions & 2 deletions examples/big-bang/manifests/.gitignore

This file was deleted.

Loading

0 comments on commit 4089195

Please sign in to comment.