From da5e74bcb4e3293220675bdbbc9c899f70e41080 Mon Sep 17 00:00:00 2001 From: auricom Date: Sun, 29 Nov 2020 20:11:38 +0100 Subject: [PATCH] add goldilocks --- cluster/monitoring/goldilocks.yaml | 25 ++++ cluster/monitoring/vpa.yaml | 111 ------------------ .../helmrelease-monitoring-goldilocks.yaml | 36 ++++++ 3 files changed, 61 insertions(+), 111 deletions(-) create mode 100644 cluster/monitoring/goldilocks.yaml delete mode 100644 cluster/monitoring/vpa.yaml create mode 100644 secrets/helmrelease-monitoring-goldilocks.yaml diff --git a/cluster/monitoring/goldilocks.yaml b/cluster/monitoring/goldilocks.yaml new file mode 100644 index 000000000..7a5cc26bf --- /dev/null +++ b/cluster/monitoring/goldilocks.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: goldilocks + namespace: monitoring +spec: + interval: 5m + chart: + spec: + chart: goldilocks + version: 3.0.3 + sourceRef: + kind: HelmRepository + name: fairwinds-charts + namespace: flux-system + interval: 5m + values: + vpa: + enable: true + image: + repository: quay.io/fairwinds/goldilocks + tag: v3.0.0 + dashboard: + replicaCount: 1 \ No newline at end of file diff --git a/cluster/monitoring/vpa.yaml b/cluster/monitoring/vpa.yaml deleted file mode 100644 index 6c7d8a011..000000000 --- a/cluster/monitoring/vpa.yaml +++ /dev/null @@ -1,111 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: vpa - namespace: monitoring -spec: - interval: 5m - chart: - spec: - chart: vpa - version: 0.1.7 - sourceRef: - kind: HelmRepository - name: fairwinds-charts - namespace: flux-system - interval: 5m ---- -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: verticalpodautoscalers.autoscaling.k8s.io - annotations: - "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/63797" -spec: - group: autoscaling.k8s.io - scope: Namespaced - names: - plural: verticalpodautoscalers - singular: verticalpodautoscaler - kind: VerticalPodAutoscaler - shortNames: - - vpa - version: v1beta1 - versions: - - name: v1beta1 - served: false - storage: false - - name: v1beta2 - served: true - storage: true - - name: v1 - served: true - storage: false - validation: - # openAPIV3Schema is the schema for validating custom objects. - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - targetRef: - type: object - updatePolicy: - type: object - properties: - updateMode: - type: string - resourcePolicy: - type: object - properties: - containerPolicies: - type: array - items: - type: object - properties: - containerName: - type: string - controlledValues: - type: string - enum: ["RequestsAndLimits", "RequestsOnly"] - mode: - type: string - enum: ["Auto", "Off"] - minAllowed: - type: object - maxAllowed: - type: object - controlledResources: - type: array - items: - type: string - enum: ["cpu", "memory"] ---- -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: verticalpodautoscalercheckpoints.autoscaling.k8s.io - annotations: - "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/63797" -spec: - group: autoscaling.k8s.io - scope: Namespaced - names: - plural: verticalpodautoscalercheckpoints - singular: verticalpodautoscalercheckpoint - kind: VerticalPodAutoscalerCheckpoint - shortNames: - - vpacheckpoint - version: v1beta1 - versions: - - name: v1beta1 - served: false - storage: false - - name: v1beta2 - served: true - storage: true - - name: v1 - served: true - storage: false \ No newline at end of file diff --git a/secrets/helmrelease-monitoring-goldilocks.yaml b/secrets/helmrelease-monitoring-goldilocks.yaml new file mode 100644 index 000000000..6ffe87fb9 --- /dev/null +++ b/secrets/helmrelease-monitoring-goldilocks.yaml @@ -0,0 +1,36 @@ +apiVersion: v1 +data: + values.yaml: ENC[AES256_GCM,data:Eq9G245D6isBLm1Hx9rOBW83EY9IOJAp5NAWelcwYqEyYPHdhepCnsOpNoYCokdzoyrBRvZ4HgrddObsOx/0+QU/nAW0i5sLu98nDTHdxppZ2vVhfd6kToqL3MadBYB7Cxw0wYXZcp27WdgVqCv6OKo50pGdct65bIv0TUFjHbC3zVD7R5asxoSqOzw+yL177GILAU7cUtlbFmnR76S4mATla5JW4yItUB94BTGvlJdLYN9Ui+CFu8AGlzTiIMq1MovWrUU55URJ6U6m1+GNkCxFHcA+RAM0rAjlzl7JDo3CM4i0fF+7FveQMSKl2dt9CgChN18uwpLP5pRwEQ6S5XNB68pnjyLMtie4EDok57jcCGekZMjcRbDEqScKvmZ44MOpVhxs8ia4zBpnFWf6RCO/G5URmhhe8DFtvhwgmyHHgoDOdNCZFTHePEfsxYov610bu6r4yYkAz0fxlpcu9IQQpwU/php2KPDwsg0o1r19cBcGfsolB8HMJp7m1q/FcRi1+jsUWSZAgQZ1zvhpBBtEcyQvt639OOxndA==,iv:UPIVNTLvsBvliri1iUmZ1pmFOZ3LK+iGmRcLxk5ikdc=,tag:8Z3Nka4gmOXW6CCvKfu9wg==,type:str] +kind: ConfigMap +metadata: + creationTimestamp: null + name: helmrelease-monitoring-goldilocks + namespace: monitoring +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + lastmodified: '2020-11-29T19:11:19Z' + mac: ENC[AES256_GCM,data:2yVCP9U9O6P8mktS3qGTsFhiYJY+QrRw2mvvFMj827WaCVskC7uXlthA6YIZtT4RvUznmwr6yHSIHlf6YbzyniBaMGotuaaXQNMYgKZ70/KmBz2oa2xjCnmXsaPiK2e33zHpa5unuXA7RhBTsOTdXNI8q8rHfEuWMVvrXBpqcq8=,iv:OKUdIL5z7bg5dofFnYOk0kDGPAa8rZg7U0NcQMwHBkw=,tag:9fbZMuMO4FNMSM38gmLHQQ==,type:str] + pgp: + - created_at: '2020-11-29T19:11:19Z' + enc: | + -----BEGIN PGP MESSAGE----- + + hQGMA/JorPHm1g9XAQv9EZrHHvo6JXKJmhsjQpla3UmKkrvXv/p9+FxSf4w4Zupa + AGqF2Sn9zFW+R2+2SrnVUMp5PUhpO7hNnYfRe5qZn1LsiMCrl18b0mhlUe/Ijfb5 + VAwCs5awTEcBZh8DDW8uKgWr+n8/w5zkRYNDxDvafs+kJOmfedyfR5/wnU1ZqGN7 + o2fp33MYJ+zOxDXVpEB/p2a747V3No8vSGBJvk5OWzLc/YtNctYsWsk2p2Vdj0s7 + Sy4D6j/G4KLUZ/B3lOBFjZlb1hf3RrcT+iMjItEGoLfE5UhNbCiyI09xh7WgiNVF + zK23i/LIuInVPwJJLVEd7M8Xzligm45nqcKZ8ydUAsd8ocpk2jr1/VRfWIEWMFCW + wcfBDIn1PKFdHKiKN6iOMPtr8Yy6F3gZ8ayLW5A8hyKYyKyzkMEziYuyqMLDGVOD + Jmc2ehhQyRsqDB4o5lsF8QS3oa+MPW/vSwP4aiX+EnbhAvbXGHqkzH5j2kJeyWj2 + MhsmqMIeKJoSeiKsuxLl0l4BeqV6wMOPDtt/IM1PLn4hHPadnFE5Es8UpW3WlBuO + +xpGOI2afrMZ3evj7e7NlIbIeN3jJ4LMLBhhZ1o7LLp/gNBoDOyb0ubxLP+liuEI + NiBbpup80v/y7S75QCdF + =e1Ov + -----END PGP MESSAGE----- + fp: C8F8A49D04A1AB639F8EA21CDBA4B1DCB1FA5BDD + encrypted_regex: ^(data|stringData)$ + version: 3.6.1