switch back to client-side apply
This commit is contained in:
parent
9018280bca
commit
0e018aac82
16
Makefile
16
Makefile
|
@ -3,8 +3,10 @@ KUSTOMIZEFLAGS =
|
|||
|
||||
KUBECTL = kubectl
|
||||
KUBECTLFLAGS =
|
||||
KUBECTLDIFFFLAGS = --server-side=true --force-conflicts
|
||||
KUBECTLAPPLYFLAGS = --server-side=true --force-conflicts --prune
|
||||
KUBECTLDIFFFLAGS =
|
||||
KUBECTLDIFFPRINTER = highlight --out-format xterm256 --syntax diff
|
||||
KUBECTLAPPLYFLAGS = --prune
|
||||
KUBECTLAPPLYPRINTER = sed -E -e 's/(.+configured)/\o033[32m\1\o033[0m/g' -e 's/(.+pruned)/\o033[31m\1\o033[0m/g'
|
||||
|
||||
SRC := $(shell find kustomize/ -type f)
|
||||
OUT = build
|
||||
|
@ -13,15 +15,15 @@ PRODOUT = $(OUT)/prod.yaml
|
|||
PRODSRC = kustomize/env/prod
|
||||
|
||||
.PHONY: prod
|
||||
prod: prod-diff
|
||||
prod: diff
|
||||
|
||||
.PHONY: diff
|
||||
prod-diff: $(PRODOUT)
|
||||
$(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | highlight --out-format xterm256 --syntax diff
|
||||
diff: $(PRODOUT)
|
||||
$(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | $(KUBECTLDIFFCOLOR)
|
||||
|
||||
.PHONY: apply
|
||||
prod-apply: $(PRODOUT)
|
||||
$(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l app.kubernetes.io/managed-by=kustomize -f $(PRODOUT)
|
||||
apply: $(PRODOUT)
|
||||
$(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l app.kubernetes.io/managed-by=kustomize -f $(PRODOUT) | $(KUBECTLAPPLYPRINTER)
|
||||
|
||||
$(PRODOUT): $(SRC)
|
||||
mkdir -p $(OUT)
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
resources:
|
||||
- https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.63.0/bundle.yaml
|
||||
|
||||
patches:
|
||||
- path: patches/alertmanagerconfigs.yaml
|
||||
- path: patches/alertmanagers.yaml
|
||||
- path: patches/podmonitors.yaml
|
||||
- path: patches/probes.yaml
|
||||
- path: patches/prometheuses.yaml
|
||||
- path: patches/prometheusrules.yaml
|
||||
- path: patches/servicemonitors.yaml
|
||||
- path: patches/thanosrulers.yaml
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: alertmanagerconfigs.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: alertmanagers.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: podmonitors.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: probes.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: prometheuses.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: prometheusrules.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: servicemonitors.monitoring.coreos.com
|
|
@ -0,0 +1,5 @@
|
|||
$patch: delete
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: thanosrulers.monitoring.coreos.com
|
|
@ -1,5 +1,6 @@
|
|||
resources:
|
||||
- https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.63.0/bundle.yaml
|
||||
- bundle/
|
||||
- https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.63.0/stripped-down-crds.yaml
|
||||
|
||||
namespace: kube-system
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ spec:
|
|||
cpu: 2000m
|
||||
memory: 2Gi
|
||||
limits:
|
||||
cpu: 3000m
|
||||
cpu: 2000m
|
||||
memory: 2Gi
|
||||
storage:
|
||||
volumeClaimTemplate:
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
- job_name: additional/bastion-haproxy
|
||||
static_configs:
|
||||
- targets: ["192.168.20.10:8080"]
|
||||
- targets: ["192.168.20.10:8080"]
|
||||
|
Loading…
Reference in New Issue