diff --git a/goldilocks-4.9/charts/vpa/Chart.lock b/goldilocks-4.9/charts/vpa/Chart.lock deleted file mode 100644 index c9f8f62..0000000 --- a/goldilocks-4.9/charts/vpa/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: metrics-server - repository: https://kubernetes-sigs.github.io/metrics-server/ - version: 3.10.0 -digest: sha256:0a1ceadffa31a28b452eddff98027bcc4df9894d22f2e74ccbfa1828477db27c -generated: "2023-06-05T09:00:56.207403385+02:00" diff --git a/goldilocks-4.9/.helmignore b/goldilocks-7.3.1/.helmignore similarity index 100% rename from goldilocks-4.9/.helmignore rename to goldilocks-7.3.1/.helmignore diff --git a/goldilocks-7.3.1/.values-home.yaml.swp b/goldilocks-7.3.1/.values-home.yaml.swp new file mode 100644 index 0000000..67a9501 Binary files /dev/null and b/goldilocks-7.3.1/.values-home.yaml.swp differ diff --git a/goldilocks-4.9/Chart.lock b/goldilocks-7.3.1/Chart.lock similarity index 53% rename from goldilocks-4.9/Chart.lock rename to goldilocks-7.3.1/Chart.lock index 21cd6dc..936985f 100644 --- a/goldilocks-4.9/Chart.lock +++ b/goldilocks-7.3.1/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: vpa repository: https://charts.fairwinds.com/stable - version: 2.2.0 + version: 2.5.1 - name: metrics-server repository: https://charts.bitnami.com/bitnami version: 6.4.1 -digest: sha256:65dfffdd82f5d6603ee038a3fa3a501efddd36ea79338c8b403e13916f53da51 -generated: "2023-07-20T15:27:42.2213269Z" +digest: sha256:358718baff45656e3b4a9fa0cddb5c17717041839542aa223620002e55e5ce26 +generated: "2023-09-05T15:36:02.054719-06:00" diff --git a/goldilocks-4.9/Chart.yaml b/goldilocks-7.3.1/Chart.yaml similarity index 92% rename from goldilocks-4.9/Chart.yaml rename to goldilocks-7.3.1/Chart.yaml index b205b1f..4b9b814 100644 --- a/goldilocks-4.9/Chart.yaml +++ b/goldilocks-7.3.1/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -appVersion: v4.9.0 +appVersion: v4.10.0 dependencies: - condition: vpa.enabled name: vpa repository: https://charts.fairwinds.com/stable - version: 2.2.0 + version: 2.5.* - condition: metrics-server.enabled name: metrics-server repository: https://charts.bitnami.com/bitnami @@ -22,4 +22,4 @@ maintainers: name: goldilocks sources: - https://github.com/FairwindsOps/goldilocks -version: 7.1.1 +version: 7.3.1 diff --git a/goldilocks-4.9/README.md b/goldilocks-7.3.1/README.md similarity index 94% rename from goldilocks-4.9/README.md rename to goldilocks-7.3.1/README.md index 9dec847..1810131 100644 --- a/goldilocks-4.9/README.md +++ b/goldilocks-7.3.1/README.md @@ -65,7 +65,7 @@ This will completely remove the VPA and then re-install it using the new method. | metrics-server.enabled | bool | `false` | If true, the metrics-server will be installed as a sub-chart | | metrics-server.apiService.create | bool | `true` | | | image.repository | string | `"us-docker.pkg.dev/fairwinds-ops/oss/goldilocks"` | Repository for the goldilocks image | -| image.tag | string | `"v4.9.0"` | The goldilocks image tag to use | +| image.tag | string | `"v4.10.0"` | The goldilocks image tag to use | | image.pullPolicy | string | `"Always"` | imagePullPolicy - Highly recommended to leave this as `Always` | | imagePullSecrets | list | `[]` | A list of image pull secret names to use | | nameOverride | string | `""` | | @@ -84,8 +84,8 @@ This will completely remove the VPA and then re-install it using the new method. | controller.tolerations | list | `[]` | Tolerations for the controller pod | | controller.affinity | object | `{}` | Affinity for the controller pods | | controller.topologySpreadConstraints | list | `[]` | Topology spread constraints for the controller pods | -| controller.resources | object | `{"limits":{"cpu":"25m","memory":"256Mi"},"requests":{"cpu":"25m","memory":"256Mi"}}` | The resources block for the controller pods | -| controller.podSecurityContext | object | `{}` | Defines the podSecurityContext for the controller pod | +| controller.resources | object | `{"limits":{},"requests":{"cpu":"25m","memory":"256Mi"}}` | The resources block for the controller pods | +| controller.podSecurityContext | object | `{"seccompProfile":{"type":"RuntimeDefault"}}` | Defines the podSecurityContext for the controller pod | | controller.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":10324}` | The container securityContext for the controller container | | controller.deployment.extraVolumeMounts | list | `[]` | Extra volume mounts for the controller container | | controller.deployment.extraVolumes | list | `[]` | Extra volumes for the controller pod | @@ -118,8 +118,8 @@ This will completely remove the VPA and then re-install it using the new method. | dashboard.ingress.hosts[0].paths[0].path | string | `"/"` | | | dashboard.ingress.hosts[0].paths[0].type | string | `"ImplementationSpecific"` | | | dashboard.ingress.tls | list | `[]` | | -| dashboard.resources | object | `{"limits":{"cpu":"25m","memory":"256Mi"},"requests":{"cpu":"25m","memory":"256Mi"}}` | A resources block for the dashboard. | -| dashboard.podSecurityContext | object | `{}` | Defines the podSecurityContext for the dashboard pod | +| dashboard.resources | object | `{"limits":{},"requests":{"cpu":"25m","memory":"256Mi"}}` | A resources block for the dashboard. | +| dashboard.podSecurityContext | object | `{"seccompProfile":{"type":"RuntimeDefault"}}` | Defines the podSecurityContext for the dashboard pod | | dashboard.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":10324}` | The container securityContext for the dashboard container | | dashboard.nodeSelector | object | `{}` | | | dashboard.tolerations | list | `[]` | | diff --git a/goldilocks-4.9/README.md.gotmpl b/goldilocks-7.3.1/README.md.gotmpl similarity index 100% rename from goldilocks-4.9/README.md.gotmpl rename to goldilocks-7.3.1/README.md.gotmpl diff --git a/goldilocks-4.9/charts/metrics-server/.helmignore b/goldilocks-7.3.1/charts/metrics-server/.helmignore similarity index 100% rename from goldilocks-4.9/charts/metrics-server/.helmignore rename to goldilocks-7.3.1/charts/metrics-server/.helmignore diff --git a/goldilocks-4.9/charts/metrics-server/Chart.lock b/goldilocks-7.3.1/charts/metrics-server/Chart.lock similarity index 100% rename from goldilocks-4.9/charts/metrics-server/Chart.lock rename to goldilocks-7.3.1/charts/metrics-server/Chart.lock diff --git a/goldilocks-4.9/charts/metrics-server/Chart.yaml b/goldilocks-7.3.1/charts/metrics-server/Chart.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/Chart.yaml rename to goldilocks-7.3.1/charts/metrics-server/Chart.yaml diff --git a/goldilocks-4.9/charts/metrics-server/README.md b/goldilocks-7.3.1/charts/metrics-server/README.md similarity index 100% rename from goldilocks-4.9/charts/metrics-server/README.md rename to goldilocks-7.3.1/charts/metrics-server/README.md diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/.helmignore b/goldilocks-7.3.1/charts/metrics-server/charts/common/.helmignore similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/.helmignore rename to goldilocks-7.3.1/charts/metrics-server/charts/common/.helmignore diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/Chart.yaml b/goldilocks-7.3.1/charts/metrics-server/charts/common/Chart.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/Chart.yaml rename to goldilocks-7.3.1/charts/metrics-server/charts/common/Chart.yaml diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/README.md b/goldilocks-7.3.1/charts/metrics-server/charts/common/README.md similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/README.md rename to goldilocks-7.3.1/charts/metrics-server/charts/common/README.md diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_affinities.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_affinities.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_affinities.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_affinities.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_capabilities.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_capabilities.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_capabilities.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_capabilities.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_errors.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_errors.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_errors.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_errors.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_images.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_images.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_images.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_images.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_ingress.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_ingress.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_ingress.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_ingress.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_labels.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_labels.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_labels.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_labels.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_names.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_names.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_names.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_names.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_secrets.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_secrets.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_secrets.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_secrets.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_storage.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_storage.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_storage.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_storage.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_tplvalues.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_tplvalues.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_tplvalues.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_tplvalues.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_utils.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_utils.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_utils.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_utils.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/_warnings.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_warnings.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/_warnings.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/_warnings.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_cassandra.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_cassandra.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_cassandra.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_cassandra.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mariadb.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mariadb.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mariadb.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mariadb.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mongodb.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mongodb.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mongodb.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mongodb.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mysql.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mysql.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_mysql.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_mysql.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_postgresql.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_postgresql.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_postgresql.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_postgresql.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_redis.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_redis.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_redis.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_redis.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_validations.tpl b/goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_validations.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/templates/validations/_validations.tpl rename to goldilocks-7.3.1/charts/metrics-server/charts/common/templates/validations/_validations.tpl diff --git a/goldilocks-4.9/charts/metrics-server/charts/common/values.yaml b/goldilocks-7.3.1/charts/metrics-server/charts/common/values.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/charts/common/values.yaml rename to goldilocks-7.3.1/charts/metrics-server/charts/common/values.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/NOTES.txt b/goldilocks-7.3.1/charts/metrics-server/templates/NOTES.txt similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/NOTES.txt rename to goldilocks-7.3.1/charts/metrics-server/templates/NOTES.txt diff --git a/goldilocks-4.9/charts/metrics-server/templates/_helpers.tpl b/goldilocks-7.3.1/charts/metrics-server/templates/_helpers.tpl similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/_helpers.tpl rename to goldilocks-7.3.1/charts/metrics-server/templates/_helpers.tpl diff --git a/goldilocks-4.9/charts/metrics-server/templates/auth-delegator-crb.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/auth-delegator-crb.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/auth-delegator-crb.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/auth-delegator-crb.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/cluster-role.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/cluster-role.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/cluster-role.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/cluster-role.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/deployment.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/deployment.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/deployment.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/deployment.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/extra-list.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/extra-list.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/extra-list.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/extra-list.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/metrics-api-service.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/metrics-api-service.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/metrics-api-service.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/metrics-api-service.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/metrics-server-crb.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/metrics-server-crb.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/metrics-server-crb.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/metrics-server-crb.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/pdb.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/pdb.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/pdb.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/pdb.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/role-binding.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/role-binding.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/role-binding.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/role-binding.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/serviceaccount.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/serviceaccount.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/serviceaccount.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/serviceaccount.yaml diff --git a/goldilocks-4.9/charts/metrics-server/templates/svc.yaml b/goldilocks-7.3.1/charts/metrics-server/templates/svc.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/templates/svc.yaml rename to goldilocks-7.3.1/charts/metrics-server/templates/svc.yaml diff --git a/goldilocks-4.9/charts/metrics-server/values.yaml b/goldilocks-7.3.1/charts/metrics-server/values.yaml similarity index 100% rename from goldilocks-4.9/charts/metrics-server/values.yaml rename to goldilocks-7.3.1/charts/metrics-server/values.yaml diff --git a/goldilocks-4.9/charts/vpa/.helmignore b/goldilocks-7.3.1/charts/vpa/.helmignore similarity index 100% rename from goldilocks-4.9/charts/vpa/.helmignore rename to goldilocks-7.3.1/charts/vpa/.helmignore diff --git a/goldilocks-7.3.1/charts/vpa/Chart.lock b/goldilocks-7.3.1/charts/vpa/Chart.lock new file mode 100644 index 0000000..f3f5ecd --- /dev/null +++ b/goldilocks-7.3.1/charts/vpa/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: metrics-server + repository: https://kubernetes-sigs.github.io/metrics-server/ + version: 3.11.0 +digest: sha256:8e75a50c785978534cc73098c2c0d9f366060e8799348a794c819f986a133029 +generated: "2023-08-16T10:36:48.403971-06:00" diff --git a/goldilocks-4.9/charts/vpa/Chart.yaml b/goldilocks-7.3.1/charts/vpa/Chart.yaml similarity index 91% rename from goldilocks-4.9/charts/vpa/Chart.yaml rename to goldilocks-7.3.1/charts/vpa/Chart.yaml index 4dbf937..88970d2 100644 --- a/goldilocks-4.9/charts/vpa/Chart.yaml +++ b/goldilocks-7.3.1/charts/vpa/Chart.yaml @@ -1,11 +1,11 @@ apiVersion: v2 -appVersion: 0.13.0 +appVersion: 0.14.0 dependencies: - alias: metrics-server condition: metrics-server.enabled name: metrics-server repository: https://kubernetes-sigs.github.io/metrics-server/ - version: 3.10.0 + version: 3.11.0 description: A Helm chart for Kubernetes Vertical Pod Autoscaler home: https://github.com/FairwindsOps/charts/tree/master/stable/vpa kubeVersion: '>= 1.21.0-0' @@ -16,4 +16,4 @@ sources: - https://github.com/FairwindsOps/charts/tree/master/stable/vpa - https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler type: application -version: 2.2.0 +version: 2.5.1 diff --git a/goldilocks-4.9/charts/vpa/README.md b/goldilocks-7.3.1/charts/vpa/README.md similarity index 95% rename from goldilocks-4.9/charts/vpa/README.md rename to goldilocks-7.3.1/charts/vpa/README.md index 3d196b3..21821bb 100644 --- a/goldilocks-4.9/charts/vpa/README.md +++ b/goldilocks-7.3.1/charts/vpa/README.md @@ -113,8 +113,10 @@ recommender: | serviceAccount.name | string | `""` | The base name of the service account to use (appended with the component). If not set and create is true, a name is generated using the fullname template and appended for each component | | serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | | recommender.enabled | bool | `true` | If true, the vpa recommender component will be installed. | +| recommender.annotations | object | `{}` | Annotations to add to the recommender deployment | | recommender.extraArgs | object | `{"pod-recommendation-min-cpu-millicores":15,"pod-recommendation-min-memory-mb":100,"v":"4"}` | A set of key-value flags to be passed to the recommender | | recommender.replicaCount | int | `1` | | +| recommender.revisionHistoryLimit | int | `10` | The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets | | recommender.podDisruptionBudget | object | `{}` | This is the setting for the pod disruption budget | | recommender.image.repository | string | `"registry.k8s.io/autoscaling/vpa-recommender"` | The location of the recommender image | | recommender.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion | @@ -131,8 +133,10 @@ recommender: | recommender.affinity | object | `{}` | | | recommender.podMonitor | object | `{"annotations":{},"enabled":false,"labels":{}}` | Enables a prometheus operator podMonitor for the recommender | | updater.enabled | bool | `true` | If true, the updater component will be deployed | +| updater.annotations | object | `{}` | Annotations to add to the updater deployment | | updater.extraArgs | object | `{}` | A key-value map of flags to pass to the updater | | updater.replicaCount | int | `1` | | +| updater.revisionHistoryLimit | int | `10` | The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets | | updater.podDisruptionBudget | object | `{}` | This is the setting for the pod disruption budget | | updater.image.repository | string | `"registry.k8s.io/autoscaling/vpa-updater"` | The location of the updater image | | updater.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion | @@ -149,6 +153,7 @@ recommender: | updater.affinity | object | `{}` | | | updater.podMonitor | object | `{"annotations":{},"enabled":false,"labels":{}}` | Enables a prometheus operator podMonitor for the updater | | admissionController.enabled | bool | `true` | If true, will install the admission-controller component of vpa | +| admissionController.annotations | object | `{}` | Annotations to add to the admission controller deployment | | admissionController.extraArgs | object | `{}` | A key-value map of flags to pass to the admissionController | | admissionController.generateCertificate | bool | `true` | If true and admissionController is enabled, a pre-install hook will run to create the certificate for the webhook | | admissionController.secretName | string | `"{{ include \"vpa.fullname\" . }}-tls-secret"` | Name for the TLS secret created for the webhook. Default {{ .Release.Name }}-tls-secret | @@ -167,6 +172,7 @@ recommender: | admissionController.mutatingWebhookConfiguration.objectSelector | object | `{}` | The objectSelector can filter object on e.g. labels | | admissionController.mutatingWebhookConfiguration.timeoutSeconds | int | `30` | | | admissionController.replicaCount | int | `1` | | +| admissionController.revisionHistoryLimit | int | `10` | The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets | | admissionController.podDisruptionBudget | object | `{}` | This is the setting for the pod disruption budget | | admissionController.image.repository | string | `"registry.k8s.io/autoscaling/vpa-admission-controller"` | The location of the vpa admission controller image | | admissionController.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion | diff --git a/goldilocks-4.9/charts/vpa/README.md.gotmpl b/goldilocks-7.3.1/charts/vpa/README.md.gotmpl similarity index 100% rename from goldilocks-4.9/charts/vpa/README.md.gotmpl rename to goldilocks-7.3.1/charts/vpa/README.md.gotmpl diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/.helmignore b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/.helmignore similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/.helmignore rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/.helmignore diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/Chart.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/Chart.yaml similarity index 59% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/Chart.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/Chart.yaml index 037f690..7c0f77a 100644 --- a/goldilocks-4.9/charts/vpa/charts/metrics-server/Chart.yaml +++ b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/Chart.yaml @@ -1,15 +1,15 @@ annotations: artifacthub.io/changes: | - - kind: fixed - description: "Fixed auth-reader role binding namespace to always use kube-system." - - kind: fixed - description: "Fixed addon resizer configuration." - kind: added - description: "Added support for running under PodSecurity restricted." - - kind: fixed - description: "Fixed container port default not having been updated to 10250." + description: "Added default Metrics Server resource requests." + - kind: changed + description: "Updated the Metrics Server OCI image to v0.6.3." + - kind: changed + description: "Updated the addon resizer OCI image to v1.8.19." + - kind: changed + description: "Changed the default addon resizer nanny resource configuration to match the documented Metrics Server autoscaling values." apiVersion: v2 -appVersion: 0.6.3 +appVersion: 0.6.4 description: Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines. home: https://github.com/kubernetes-sigs/metrics-server @@ -29,4 +29,4 @@ name: metrics-server sources: - https://github.com/kubernetes-sigs/metrics-server type: application -version: 3.10.0 +version: 3.11.0 diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/README.md b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/README.md similarity index 81% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/README.md rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/README.md index a10cbae..50956b9 100644 --- a/goldilocks-4.9/charts/vpa/charts/metrics-server/README.md +++ b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/README.md @@ -22,69 +22,69 @@ helm upgrade --install metrics-server metrics-server/metrics-server The following table lists the configurable parameters of the _Metrics Server_ chart and their default values. -| Parameter | Description | Default | -| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------ | -| `image.repository` | Image repository. | `registry.k8s.io/metrics-server/metrics-server` | -| `image.tag` | Image tag, will override the default tag derived from the chart app version. | `""` | -| `image.pullPolicy` | Image pull policy. | `IfNotPresent` | -| `imagePullSecrets` | Image pull secrets. | `[]` | -| `nameOverride` | Override the `name` of the chart. | `nil` | -| `fullnameOverride` | Override the `fullname` of the chart. | `nil` | -| `serviceAccount.create` | If `true`, create a new service account. | `true` | -| `serviceAccount.annotations` | Annotations to add to the service account. | `{}` | -| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template. | `nil` | -| `serviceAccount.secrets` | The list of secrets mountable by this service account. See https://kubernetes.io/docs/reference/labels-annotations-taints/#enforce-mountable-secrets | `[]` | -| `rbac.create` | If `true`, create the RBAC resources. | `true` | -| `rbac.pspEnabled` | If `true`, create a pod security policy resource. | `false` | -| `apiService.create` | If `true`, create the `v1beta1.metrics.k8s.io` API service. You typically want this enabled! If you disable API service creation you have to manage it outside of this chart for e.g horizontal pod autoscaling to work with this release. | `true` | -| `apiService.annotations` | Annotations to add to the API service | `{}` | -| `apiService.insecureSkipTLSVerify` | Specifies whether to skip TLS verification | `true` | -| `apiService.caBundle` | The PEM encoded CA bundle for TLS verification | `""` | -| `commonLabels` | Labels to add to each object of the chart. | `{}` | -| `podLabels` | Labels to add to the pod. | `{}` | -| `podAnnotations` | Annotations to add to the pod. | `{}` | -| `podSecurityContext` | Security context for the pod. | `{}` | -| `securityContext` | Security context for the _metrics-server_ container. | _See values.yaml_ | -| `priorityClassName` | Priority class name to use. | `system-cluster-critical` | -| `containerPort` | port for the _metrics-server_ container. | `10250` | -| `hostNetwork.enabled` | If `true`, start _metric-server_ in hostNetwork mode. You would require this enabled if you use alternate overlay networking for pods and API server unable to communicate with metrics-server. As an example, this is required if you use Weave network on EKS. | `false` | -| `replicas` | Number of replicas to run. | `1` | -| `updateStrategy` | Customise the default update strategy. | `{}` | -| `podDisruptionBudget.enabled` | If `true`, create `PodDisruptionBudget` resource. | `{}` | -| `podDisruptionBudget.minAvailable` | Set the `PodDisruptionBugdet` minimum available pods. | `nil` | -| `podDisruptionBudget.maxUnavailable` | Set the `PodDisruptionBugdet` maximum unavailable pods. | `nil` | -| `defaultArgs` | Default arguments to pass to the _metrics-server_ command. | See _values.yaml_ | -| `args` | Additional arguments to pass to the _metrics-server_ command. | `[]` | -| `livenessProbe` | Liveness probe. | See _values.yaml_ | -| `readinessProbe` | Readiness probe. | See _values.yaml_ | -| `service.type` | Service type. | `ClusterIP` | -| `service.port` | Service port. | `443` | -| `service.annotations` | Annotations to add to the service. | `{}` | -| `service.labels` | Labels to add to the service. | `{}` | -| `addonResizer.enabled` | If `true`, run the addon-resizer as a sidecar to automatically scale resource requests with cluster size. | `false` | -| `addonResizer.image.repository` | addon-resizer image repository | registry.k8s.io/autoscaling/addon-resizer | -| `addonResizer.image.tag` | addon-resizer image tag | 1.8.14 | -| `addonResizer.resources` | Resource requests and limits for the _nanny_ container. | `{limits: {cpu: 40m, memory: 25Mi}, requests: {cpu: 40m, memory: 25Mi}}` | -| `addonResizer.nanny.cpu` | The base CPU requirement. | 20m | -| `addonResizer.nanny.extraCPU` | The amount of CPU to add per node. | 1m | -| `addonResizer.nanny.extraMemory` | The amount of memory to add per node. | 2Mi | -| `addonResizer.nanny.memory` | The base memory requirement. | 15Mi | -| `addonResizer.nanny.minClusterSize` | Specifies the smallest number of nodes resources will be scaled to. | 10 | -| `addonResizer.nanny.pollPeriod` | The time, in milliseconds, to poll the dependent container. | 300000 | -| `addonResizer.nanny.threshold` | A number between 0-100. The dependent's resources are rewritten when they deviate from expected by more than threshold. | 5 | -| `metrics.enabled` | If `true`, allow unauthenticated access to `/metrics`. | `false` | -| `serviceMonitor.enabled` | If `true`, create a _Prometheus_ service monitor. This needs `metrics.enabled` to be `true`. | `false` | -| `serviceMonitor.additionalLabels` | Additional labels to be set on the ServiceMonitor. | `{}` | -| `serviceMonitor.metricRelabelings` | _Prometheus_ metric relabeling. | `[]` | -| `serviceMonitor.relabelings` | _Prometheus_ relabeling. | `[]` | -| `serviceMonitor.interval` | _Prometheus_ scrape frequency. | `1m` | -| `serviceMonitor.scrapeTimeout` | _Prometheus_ scrape timeout. | `10s` | -| `resources` | Resource requests and limits for the _metrics-server_ container. See https://github.com/kubernetes-sigs/metrics-server#scaling | `{}` | -| `extraVolumeMounts` | Additional volume mounts for the _metrics-server_ container. | `[]` | -| `extraVolumes` | Additional volumes for the pod. | `[]` | -| `nodeSelector` | Node labels for pod assignment. | `{}` | -| `tolerations` | Tolerations for pod assignment. | `[]` | -| `affinity` | Affinity for pod assignment. | `{}` | -| `topologySpreadConstraints` | Pod Topology Spread Constraints. | `[]` | -| `deploymentAnnotations` | Annotations to add to the deployment. | `{}` | -| `schedulerName` | scheduler to set to the deployment. | `""` | +| Parameter | Description | Default | +| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | +| `image.repository` | Image repository. | `registry.k8s.io/metrics-server/metrics-server` | +| `image.tag` | Image tag, will override the default tag derived from the chart app version. | `""` | +| `image.pullPolicy` | Image pull policy. | `IfNotPresent` | +| `imagePullSecrets` | Image pull secrets. | `[]` | +| `nameOverride` | Override the `name` of the chart. | `nil` | +| `fullnameOverride` | Override the `fullname` of the chart. | `nil` | +| `serviceAccount.create` | If `true`, create a new service account. | `true` | +| `serviceAccount.annotations` | Annotations to add to the service account. | `{}` | +| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template. | `nil` | +| `serviceAccount.secrets` | The list of secrets mountable by this service account. See https://kubernetes.io/docs/reference/labels-annotations-taints/#enforce-mountable-secrets | `[]` | +| `rbac.create` | If `true`, create the RBAC resources. | `true` | +| `rbac.pspEnabled` | If `true`, create a pod security policy resource. | `false` | +| `apiService.create` | If `true`, create the `v1beta1.metrics.k8s.io` API service. You typically want this enabled! If you disable API service creation you have to manage it outside of this chart for e.g horizontal pod autoscaling to work with this release. | `true` | +| `apiService.annotations` | Annotations to add to the API service | `{}` | +| `apiService.insecureSkipTLSVerify` | Specifies whether to skip TLS verification | `true` | +| `apiService.caBundle` | The PEM encoded CA bundle for TLS verification | `""` | +| `commonLabels` | Labels to add to each object of the chart. | `{}` | +| `podLabels` | Labels to add to the pod. | `{}` | +| `podAnnotations` | Annotations to add to the pod. | `{}` | +| `podSecurityContext` | Security context for the pod. | `{}` | +| `securityContext` | Security context for the _metrics-server_ container. | _See values.yaml_ | +| `priorityClassName` | Priority class name to use. | `system-cluster-critical` | +| `containerPort` | port for the _metrics-server_ container. | `10250` | +| `hostNetwork.enabled` | If `true`, start _metric-server_ in hostNetwork mode. You would require this enabled if you use alternate overlay networking for pods and API server unable to communicate with metrics-server. As an example, this is required if you use Weave network on EKS. | `false` | +| `replicas` | Number of replicas to run. | `1` | +| `updateStrategy` | Customise the default update strategy. | `{}` | +| `podDisruptionBudget.enabled` | If `true`, create `PodDisruptionBudget` resource. | `{}` | +| `podDisruptionBudget.minAvailable` | Set the `PodDisruptionBugdet` minimum available pods. | `nil` | +| `podDisruptionBudget.maxUnavailable` | Set the `PodDisruptionBugdet` maximum unavailable pods. | `nil` | +| `defaultArgs` | Default arguments to pass to the _metrics-server_ command. | See _values.yaml_ | +| `args` | Additional arguments to pass to the _metrics-server_ command. | `[]` | +| `livenessProbe` | Liveness probe. | See _values.yaml_ | +| `readinessProbe` | Readiness probe. | See _values.yaml_ | +| `service.type` | Service type. | `ClusterIP` | +| `service.port` | Service port. | `443` | +| `service.annotations` | Annotations to add to the service. | `{}` | +| `service.labels` | Labels to add to the service. | `{}` | +| `addonResizer.enabled` | If `true`, run the addon-resizer as a sidecar to automatically scale resource requests with cluster size. | `false` | +| `addonResizer.image.repository` | addon-resizer image repository | `registry.k8s.io/autoscaling/addon-resizer` | +| `addonResizer.image.tag` | addon-resizer image tag | `1.8.19` | +| `addonResizer.resources` | Resource requests and limits for the _nanny_ container. | `{ requests: { cpu: 40m, memory: 25Mi }, limits: { cpu: 40m, memory: 25Mi } }` | +| `addonResizer.nanny.cpu` | The base CPU requirement. | `0m` | +| `addonResizer.nanny.extraCPU` | The amount of CPU to add per node. | `1m` | +| `addonResizer.nanny.memory` | The base memory requirement. | `0Mi` | +| `addonResizer.nanny.extraMemory` | The amount of memory to add per node. | `2Mi` | +| `addonResizer.nanny.minClusterSize` | Specifies the smallest number of nodes resources will be scaled to. | `100` | +| `addonResizer.nanny.pollPeriod` | The time, in milliseconds, to poll the dependent container. | `300000` | +| `addonResizer.nanny.threshold` | A number between 0-100. The dependent's resources are rewritten when they deviate from expected by more than threshold. | `5` | +| `metrics.enabled` | If `true`, allow unauthenticated access to `/metrics`. | `false` | +| `serviceMonitor.enabled` | If `true`, create a _Prometheus_ service monitor. This needs `metrics.enabled` to be `true`. | `false` | +| `serviceMonitor.additionalLabels` | Additional labels to be set on the ServiceMonitor. | `{}` | +| `serviceMonitor.metricRelabelings` | _Prometheus_ metric relabeling. | `[]` | +| `serviceMonitor.relabelings` | _Prometheus_ relabeling. | `[]` | +| `serviceMonitor.interval` | _Prometheus_ scrape frequency. | `1m` | +| `serviceMonitor.scrapeTimeout` | _Prometheus_ scrape timeout. | `10s` | +| `resources` | Resource requests and limits for the _metrics-server_ container. See https://github.com/kubernetes-sigs/metrics-server#scaling | `{ requests: { cpu: 100m, memory: 200Mi }}` | +| `extraVolumeMounts` | Additional volume mounts for the _metrics-server_ container. | `[]` | +| `extraVolumes` | Additional volumes for the pod. | `[]` | +| `nodeSelector` | Node labels for pod assignment. | `{}` | +| `tolerations` | Tolerations for pod assignment. | `[]` | +| `affinity` | Affinity for pod assignment. | `{}` | +| `topologySpreadConstraints` | Pod Topology Spread Constraints. | `[]` | +| `deploymentAnnotations` | Annotations to add to the deployment. | `{}` | +| `schedulerName` | scheduler to set to the deployment. | `""` | diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/ci/ci-values.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/ci/ci-values.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/ci/ci-values.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/ci/ci-values.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/NOTES.txt b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/NOTES.txt similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/NOTES.txt rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/NOTES.txt diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/_helpers.tpl b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/_helpers.tpl similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/_helpers.tpl rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/_helpers.tpl diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/apiservice.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/apiservice.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/apiservice.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/apiservice.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole-aggregated-reader.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole-aggregated-reader.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole-aggregated-reader.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole-aggregated-reader.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole-nanny.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole-nanny.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole-nanny.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole-nanny.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrole.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrole.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding-nanny.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding-nanny.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding-nanny.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding-nanny.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/clusterrolebinding.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/clusterrolebinding.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/configmaps-nanny.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/configmaps-nanny.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/configmaps-nanny.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/configmaps-nanny.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/deployment.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/deployment.yaml similarity index 98% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/deployment.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/deployment.yaml index 9f44be4..1d656fc 100644 --- a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/deployment.yaml +++ b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/deployment.yaml @@ -103,9 +103,8 @@ spec: - /pod_nanny - --config-dir=/etc/config - --deployment={{ include "metrics-server.fullname" . }} - - --threshold={{ .Values.addonResizer.nanny.threshold }} - - --deployment={{ include "metrics-server.fullname" . }} - --container=metrics-server + - --threshold={{ .Values.addonResizer.nanny.threshold }} - --poll-period={{ .Values.addonResizer.nanny.pollPeriod }} - --estimator=exponential - --minClusterSize={{ .Values.addonResizer.nanny.minClusterSize }} diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/pdb.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/pdb.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/pdb.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/pdb.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/psp.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/psp.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/psp.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/psp.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/role-nanny.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/role-nanny.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/role-nanny.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/role-nanny.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/rolebinding-nanny.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/rolebinding-nanny.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/rolebinding-nanny.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/rolebinding-nanny.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/rolebinding.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/rolebinding.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/rolebinding.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/rolebinding.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/service.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/service.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/service.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/service.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/serviceaccount.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/serviceaccount.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/serviceaccount.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/serviceaccount.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/templates/servicemonitor.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/servicemonitor.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/templates/servicemonitor.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/templates/servicemonitor.yaml diff --git a/goldilocks-4.9/charts/vpa/charts/metrics-server/values.yaml b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/values.yaml similarity index 95% rename from goldilocks-4.9/charts/vpa/charts/metrics-server/values.yaml rename to goldilocks-7.3.1/charts/vpa/charts/metrics-server/values.yaml index 7520a94..fba10aa 100644 --- a/goldilocks-4.9/charts/vpa/charts/metrics-server/values.yaml +++ b/goldilocks-7.3.1/charts/vpa/charts/metrics-server/values.yaml @@ -127,20 +127,20 @@ addonResizer: enabled: false image: repository: registry.k8s.io/autoscaling/addon-resizer - tag: 1.8.14 + tag: 1.8.19 resources: - limits: - cpu: 40m - memory: 25Mi requests: cpu: 40m memory: 25Mi + limits: + cpu: 40m + memory: 25Mi nanny: - cpu: 20m + cpu: 0m extraCpu: 1m + memory: 0Mi extraMemory: 2Mi - memory: 15Mi - minClusterSize: 10 + minClusterSize: 100 pollPeriod: 300000 threshold: 5 @@ -156,7 +156,13 @@ serviceMonitor: relabelings: [] # See https://github.com/kubernetes-sigs/metrics-server#scaling -resources: {} +resources: + requests: + cpu: 100m + memory: 200Mi + # limits: + # cpu: + # memory: extraVolumeMounts: [] diff --git a/goldilocks-4.9/charts/vpa/ci/test-values.yaml b/goldilocks-7.3.1/charts/vpa/ci/test-values.yaml similarity index 64% rename from goldilocks-4.9/charts/vpa/ci/test-values.yaml rename to goldilocks-7.3.1/charts/vpa/ci/test-values.yaml index 00b4602..84efcd7 100644 --- a/goldilocks-4.9/charts/vpa/ci/test-values.yaml +++ b/goldilocks-7.3.1/charts/vpa/ci/test-values.yaml @@ -1,15 +1,24 @@ recommender: enabled: true + annotations: + foo: bar + "foo.io/deploy-repo": "https://gitlab.com/foo/myrepo" podLabels: app: test foo: bar updater: enabled: true + annotations: + foo: bar + "foo.io/deploy-repo": "https://gitlab.com/foo/myrepo" podLabels: app: test foo: bar admissionController: enabled: true + annotations: + foo: bar + "foo.io/deploy-repo": "https://gitlab.com/foo/myrepo" extraArgs: v: "4" generateCertificate: true diff --git a/goldilocks-4.9/charts/vpa/crds/vpa-v1-crd.yaml b/goldilocks-7.3.1/charts/vpa/crds/vpa-v1-crd.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/crds/vpa-v1-crd.yaml rename to goldilocks-7.3.1/charts/vpa/crds/vpa-v1-crd.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/NOTES.txt b/goldilocks-7.3.1/charts/vpa/templates/NOTES.txt similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/NOTES.txt rename to goldilocks-7.3.1/charts/vpa/templates/NOTES.txt diff --git a/goldilocks-4.9/charts/vpa/templates/_helpers.tpl b/goldilocks-7.3.1/charts/vpa/templates/_helpers.tpl similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/_helpers.tpl rename to goldilocks-7.3.1/charts/vpa/templates/_helpers.tpl diff --git a/goldilocks-4.9/charts/vpa/templates/admission-controller-deployment.yaml b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-deployment.yaml similarity index 92% rename from goldilocks-4.9/charts/vpa/templates/admission-controller-deployment.yaml rename to goldilocks-7.3.1/charts/vpa/templates/admission-controller-deployment.yaml index 1c26906..5ab28de 100644 --- a/goldilocks-4.9/charts/vpa/templates/admission-controller-deployment.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-deployment.yaml @@ -2,12 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: + {{- if .Values.admissionController.annotations }} + annotations: + {{- .Values.admissionController.annotations | toYaml | nindent 4 }} + {{- end }} name: {{ include "vpa.fullname" . }}-admission-controller labels: app.kubernetes.io/component: admission-controller {{- include "vpa.labels" . | nindent 4 }} spec: replicas: {{ .Values.admissionController.replicaCount }} + {{- if .Values.admissionController.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.admissionController.revisionHistoryLimit }} + {{- end }} selector: matchLabels: app.kubernetes.io/component: admission-controller diff --git a/goldilocks-4.9/charts/vpa/templates/admission-controller-pdb.yaml b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-pdb.yaml similarity index 89% rename from goldilocks-4.9/charts/vpa/templates/admission-controller-pdb.yaml rename to goldilocks-7.3.1/charts/vpa/templates/admission-controller-pdb.yaml index c203a69..94ab1f7 100644 --- a/goldilocks-4.9/charts/vpa/templates/admission-controller-pdb.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-pdb.yaml @@ -9,5 +9,5 @@ spec: selector: matchLabels: app.kubernetes.io/component: admission-controller - app.kubernetes.io/name: {{ template "vpa.fullname" . }} + app.kubernetes.io/name: {{ template "vpa.name" . }} {{- end }} diff --git a/goldilocks-4.9/charts/vpa/templates/admission-controller-rbac.yaml b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-rbac.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/admission-controller-rbac.yaml rename to goldilocks-7.3.1/charts/vpa/templates/admission-controller-rbac.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/admission-controller-service-account.yaml b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-service-account.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/admission-controller-service-account.yaml rename to goldilocks-7.3.1/charts/vpa/templates/admission-controller-service-account.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/admission-controller-service.yaml b/goldilocks-7.3.1/charts/vpa/templates/admission-controller-service.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/admission-controller-service.yaml rename to goldilocks-7.3.1/charts/vpa/templates/admission-controller-service.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/clusterrolebindings.yaml b/goldilocks-7.3.1/charts/vpa/templates/clusterrolebindings.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/clusterrolebindings.yaml rename to goldilocks-7.3.1/charts/vpa/templates/clusterrolebindings.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/clusterroles.yaml b/goldilocks-7.3.1/charts/vpa/templates/clusterroles.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/clusterroles.yaml rename to goldilocks-7.3.1/charts/vpa/templates/clusterroles.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/recommender-deployment.yaml b/goldilocks-7.3.1/charts/vpa/templates/recommender-deployment.yaml similarity index 90% rename from goldilocks-4.9/charts/vpa/templates/recommender-deployment.yaml rename to goldilocks-7.3.1/charts/vpa/templates/recommender-deployment.yaml index d6ec515..9ac23c5 100644 --- a/goldilocks-4.9/charts/vpa/templates/recommender-deployment.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/recommender-deployment.yaml @@ -2,12 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: + {{- if .Values.recommender.annotations }} + annotations: + {{- .Values.recommender.annotations | toYaml | nindent 4 }} + {{- end }} name: {{ include "vpa.fullname" . }}-recommender labels: app.kubernetes.io/component: recommender {{- include "vpa.labels" . | nindent 4 }} spec: replicas: {{ .Values.recommender.replicaCount }} + {{- if .Values.recommender.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.recommender.revisionHistoryLimit }} + {{- end }} selector: matchLabels: app.kubernetes.io/component: recommender diff --git a/goldilocks-4.9/charts/vpa/templates/recommender-pdb.yaml b/goldilocks-7.3.1/charts/vpa/templates/recommender-pdb.yaml similarity index 89% rename from goldilocks-4.9/charts/vpa/templates/recommender-pdb.yaml rename to goldilocks-7.3.1/charts/vpa/templates/recommender-pdb.yaml index d4d238b..6a16ce0 100644 --- a/goldilocks-4.9/charts/vpa/templates/recommender-pdb.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/recommender-pdb.yaml @@ -9,5 +9,5 @@ spec: selector: matchLabels: app.kubernetes.io/component: recommender - app.kubernetes.io/name: {{ template "vpa.fullname" . }} + app.kubernetes.io/name: {{ template "vpa.name" . }} {{- end }} diff --git a/goldilocks-4.9/charts/vpa/templates/recommender-podmonitor.yaml b/goldilocks-7.3.1/charts/vpa/templates/recommender-podmonitor.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/recommender-podmonitor.yaml rename to goldilocks-7.3.1/charts/vpa/templates/recommender-podmonitor.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/recommender-service-account.yaml b/goldilocks-7.3.1/charts/vpa/templates/recommender-service-account.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/recommender-service-account.yaml rename to goldilocks-7.3.1/charts/vpa/templates/recommender-service-account.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/tests/_test_helpers.tpl b/goldilocks-7.3.1/charts/vpa/templates/tests/_test_helpers.tpl similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/_test_helpers.tpl rename to goldilocks-7.3.1/charts/vpa/templates/tests/_test_helpers.tpl diff --git a/goldilocks-4.9/charts/vpa/templates/tests/crds-available.yaml b/goldilocks-7.3.1/charts/vpa/templates/tests/crds-available.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/crds-available.yaml rename to goldilocks-7.3.1/charts/vpa/templates/tests/crds-available.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/tests/create-vpa.yaml b/goldilocks-7.3.1/charts/vpa/templates/tests/create-vpa.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/create-vpa.yaml rename to goldilocks-7.3.1/charts/vpa/templates/tests/create-vpa.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/tests/metrics.yaml b/goldilocks-7.3.1/charts/vpa/templates/tests/metrics.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/metrics.yaml rename to goldilocks-7.3.1/charts/vpa/templates/tests/metrics.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/tests/rbac.yaml b/goldilocks-7.3.1/charts/vpa/templates/tests/rbac.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/rbac.yaml rename to goldilocks-7.3.1/charts/vpa/templates/tests/rbac.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/tests/webhook.yaml b/goldilocks-7.3.1/charts/vpa/templates/tests/webhook.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/tests/webhook.yaml rename to goldilocks-7.3.1/charts/vpa/templates/tests/webhook.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/updater-deployment.yaml b/goldilocks-7.3.1/charts/vpa/templates/updater-deployment.yaml similarity index 91% rename from goldilocks-4.9/charts/vpa/templates/updater-deployment.yaml rename to goldilocks-7.3.1/charts/vpa/templates/updater-deployment.yaml index 0f99d32..285c398 100644 --- a/goldilocks-4.9/charts/vpa/templates/updater-deployment.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/updater-deployment.yaml @@ -2,12 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: + {{- if .Values.updater.annotations }} + annotations: + {{- .Values.updater.annotations | toYaml | nindent 4 }} + {{- end }} name: {{ include "vpa.fullname" . }}-updater labels: app.kubernetes.io/component: updater {{- include "vpa.labels" . | nindent 4 }} spec: replicas: {{ .Values.updater.replicaCount }} + {{- if .Values.updater.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.updater.revisionHistoryLimit }} + {{- end }} selector: matchLabels: app.kubernetes.io/component: updater diff --git a/goldilocks-4.9/charts/vpa/templates/updater-pdb.yaml b/goldilocks-7.3.1/charts/vpa/templates/updater-pdb.yaml similarity index 88% rename from goldilocks-4.9/charts/vpa/templates/updater-pdb.yaml rename to goldilocks-7.3.1/charts/vpa/templates/updater-pdb.yaml index 4c1c304..e9ea1f7 100644 --- a/goldilocks-4.9/charts/vpa/templates/updater-pdb.yaml +++ b/goldilocks-7.3.1/charts/vpa/templates/updater-pdb.yaml @@ -9,5 +9,5 @@ spec: selector: matchLabels: app.kubernetes.io/component: updater - app.kubernetes.io/name: {{ template "vpa.fullname" . }} + app.kubernetes.io/name: {{ template "vpa.name" . }} {{- end }} diff --git a/goldilocks-4.9/charts/vpa/templates/updater-podmonitor.yaml b/goldilocks-7.3.1/charts/vpa/templates/updater-podmonitor.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/updater-podmonitor.yaml rename to goldilocks-7.3.1/charts/vpa/templates/updater-podmonitor.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/updater-service-account.yaml b/goldilocks-7.3.1/charts/vpa/templates/updater-service-account.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/updater-service-account.yaml rename to goldilocks-7.3.1/charts/vpa/templates/updater-service-account.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/_webhook_helpers.tpl b/goldilocks-7.3.1/charts/vpa/templates/webhooks/_webhook_helpers.tpl similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/_webhook_helpers.tpl rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/_webhook_helpers.tpl diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-create.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-create.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-create.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-create.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-patch.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-patch.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-patch.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-patch.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-role.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-role.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-role.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-role.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml diff --git a/goldilocks-4.9/charts/vpa/templates/webhooks/mutating.yaml b/goldilocks-7.3.1/charts/vpa/templates/webhooks/mutating.yaml similarity index 100% rename from goldilocks-4.9/charts/vpa/templates/webhooks/mutating.yaml rename to goldilocks-7.3.1/charts/vpa/templates/webhooks/mutating.yaml diff --git a/goldilocks-4.9/charts/vpa/values.yaml b/goldilocks-7.3.1/charts/vpa/values.yaml similarity index 93% rename from goldilocks-4.9/charts/vpa/values.yaml rename to goldilocks-7.3.1/charts/vpa/values.yaml index fc332f1..89cde5f 100644 --- a/goldilocks-4.9/charts/vpa/values.yaml +++ b/goldilocks-7.3.1/charts/vpa/values.yaml @@ -30,12 +30,16 @@ serviceAccount: recommender: # recommender.enabled -- If true, the vpa recommender component will be installed. enabled: true + # recommender.annotations -- Annotations to add to the recommender deployment + annotations: {} # recommender.extraArgs -- A set of key-value flags to be passed to the recommender extraArgs: v: "4" pod-recommendation-min-cpu-millicores: 15 pod-recommendation-min-memory-mb: 100 replicaCount: 1 + # recommender.revisionHistoryLimit -- The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets + revisionHistoryLimit: 10 # recommender.podDisruptionBudget -- This is the setting for the pod disruption budget podDisruptionBudget: {} # maxUnavailable: 1 @@ -96,9 +100,13 @@ recommender: updater: # updater.enabled -- If true, the updater component will be deployed enabled: true + # updater.annotations -- Annotations to add to the updater deployment + annotations: {} # updater.extraArgs -- A key-value map of flags to pass to the updater extraArgs: {} replicaCount: 1 + # updater.revisionHistoryLimit -- The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets + revisionHistoryLimit: 10 # updater.podDisruptionBudget -- This is the setting for the pod disruption budget podDisruptionBudget: {} # maxUnavailable: 1 @@ -159,6 +167,8 @@ updater: admissionController: # admissionController.enabled -- If true, will install the admission-controller component of vpa enabled: true + # admissionController.annotations -- Annotations to add to the admission controller deployment + annotations: {} # admissionController.extraArgs -- A key-value map of flags to pass to the admissionController extraArgs: {} # admissionController.generateCertificate -- If true and admissionController is enabled, a pre-install hook will run to create the certificate for the webhook @@ -196,6 +206,8 @@ admissionController: timeoutSeconds: 30 replicaCount: 1 + # admissionController.revisionHistoryLimit -- The number of old replicasets to retain, default is 10, 0 will garbage-collect old replicasets + revisionHistoryLimit: 10 # admissionController.podDisruptionBudget -- This is the setting for the pod disruption budget podDisruptionBudget: {} # maxUnavailable: 1 diff --git a/goldilocks-4.9/ci/service-account-name-values.yaml b/goldilocks-7.3.1/ci/service-account-name-values.yaml similarity index 100% rename from goldilocks-4.9/ci/service-account-name-values.yaml rename to goldilocks-7.3.1/ci/service-account-name-values.yaml diff --git a/goldilocks-4.9/ci/test-values.yaml b/goldilocks-7.3.1/ci/test-values.yaml similarity index 100% rename from goldilocks-4.9/ci/test-values.yaml rename to goldilocks-7.3.1/ci/test-values.yaml diff --git a/goldilocks-4.9/icon.png b/goldilocks-7.3.1/icon.png similarity index 100% rename from goldilocks-4.9/icon.png rename to goldilocks-7.3.1/icon.png diff --git a/goldilocks-4.9/logo.svg b/goldilocks-7.3.1/logo.svg similarity index 100% rename from goldilocks-4.9/logo.svg rename to goldilocks-7.3.1/logo.svg diff --git a/goldilocks-4.9/templates/NOTES.txt b/goldilocks-7.3.1/templates/NOTES.txt similarity index 100% rename from goldilocks-4.9/templates/NOTES.txt rename to goldilocks-7.3.1/templates/NOTES.txt diff --git a/goldilocks-4.9/templates/_helpers.tpl b/goldilocks-7.3.1/templates/_helpers.tpl similarity index 100% rename from goldilocks-4.9/templates/_helpers.tpl rename to goldilocks-7.3.1/templates/_helpers.tpl diff --git a/goldilocks-4.9/templates/controller-clusterrole.yaml b/goldilocks-7.3.1/templates/controller-clusterrole.yaml similarity index 90% rename from goldilocks-4.9/templates/controller-clusterrole.yaml rename to goldilocks-7.3.1/templates/controller-clusterrole.yaml index c1cf9f1..11284ff 100644 --- a/goldilocks-4.9/templates/controller-clusterrole.yaml +++ b/goldilocks-7.3.1/templates/controller-clusterrole.yaml @@ -18,6 +18,15 @@ rules: - 'get' - 'list' - 'watch' + - apiGroups: + - 'batch' + resources: + - 'cronjobs' + - 'jobs' + verbs: + - 'get' + - 'list' + - 'watch' - apiGroups: - '' resources: diff --git a/goldilocks-4.9/templates/controller-clusterrolebinding.yaml b/goldilocks-7.3.1/templates/controller-clusterrolebinding.yaml similarity index 100% rename from goldilocks-4.9/templates/controller-clusterrolebinding.yaml rename to goldilocks-7.3.1/templates/controller-clusterrolebinding.yaml diff --git a/goldilocks-4.9/templates/controller-deployment.yaml b/goldilocks-7.3.1/templates/controller-deployment.yaml similarity index 100% rename from goldilocks-4.9/templates/controller-deployment.yaml rename to goldilocks-7.3.1/templates/controller-deployment.yaml diff --git a/goldilocks-4.9/templates/controller-serviceaccount.yaml b/goldilocks-7.3.1/templates/controller-serviceaccount.yaml similarity index 100% rename from goldilocks-4.9/templates/controller-serviceaccount.yaml rename to goldilocks-7.3.1/templates/controller-serviceaccount.yaml diff --git a/goldilocks-4.9/templates/dashboard-clusterrole.yaml b/goldilocks-7.3.1/templates/dashboard-clusterrole.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-clusterrole.yaml rename to goldilocks-7.3.1/templates/dashboard-clusterrole.yaml diff --git a/goldilocks-4.9/templates/dashboard-clusterrolebinding.yaml b/goldilocks-7.3.1/templates/dashboard-clusterrolebinding.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-clusterrolebinding.yaml rename to goldilocks-7.3.1/templates/dashboard-clusterrolebinding.yaml diff --git a/goldilocks-4.9/templates/dashboard-deployment.yaml b/goldilocks-7.3.1/templates/dashboard-deployment.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-deployment.yaml rename to goldilocks-7.3.1/templates/dashboard-deployment.yaml diff --git a/goldilocks-4.9/templates/dashboard-ingress.yaml b/goldilocks-7.3.1/templates/dashboard-ingress.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-ingress.yaml rename to goldilocks-7.3.1/templates/dashboard-ingress.yaml diff --git a/goldilocks-4.9/templates/dashboard-service.yaml b/goldilocks-7.3.1/templates/dashboard-service.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-service.yaml rename to goldilocks-7.3.1/templates/dashboard-service.yaml diff --git a/goldilocks-4.9/templates/dashboard-serviceaccount.yaml b/goldilocks-7.3.1/templates/dashboard-serviceaccount.yaml similarity index 100% rename from goldilocks-4.9/templates/dashboard-serviceaccount.yaml rename to goldilocks-7.3.1/templates/dashboard-serviceaccount.yaml diff --git a/goldilocks-4.9/templates/vpa-uninstall-hook.yaml b/goldilocks-7.3.1/templates/vpa-uninstall-hook.yaml similarity index 100% rename from goldilocks-4.9/templates/vpa-uninstall-hook.yaml rename to goldilocks-7.3.1/templates/vpa-uninstall-hook.yaml diff --git a/goldilocks-4.9/values-home.yaml b/goldilocks-7.3.1/values-home.yaml similarity index 99% rename from goldilocks-4.9/values-home.yaml rename to goldilocks-7.3.1/values-home.yaml index 3707c9f..e2c06f7 100644 --- a/goldilocks-4.9/values-home.yaml +++ b/goldilocks-7.3.1/values-home.yaml @@ -3,7 +3,7 @@ uninstallVPA: false vpa: # vpa.enabled -- If true, the vpa will be installed as a sub-chart - enabled: false + enabled: true updater: enabled: false diff --git a/goldilocks-4.9/values.yaml b/goldilocks-7.3.1/values.yaml similarity index 97% rename from goldilocks-4.9/values.yaml rename to goldilocks-7.3.1/values.yaml index 9593900..3fe2604 100644 --- a/goldilocks-4.9/values.yaml +++ b/goldilocks-7.3.1/values.yaml @@ -17,7 +17,7 @@ image: # image.repository -- Repository for the goldilocks image repository: us-docker.pkg.dev/fairwinds-ops/oss/goldilocks # image.tag -- The goldilocks image tag to use - tag: v4.9.0 + tag: v4.10.0 # image.pullPolicy -- imagePullPolicy - Highly recommended to leave this as `Always` pullPolicy: Always @@ -61,14 +61,14 @@ controller: topologySpreadConstraints: [] # controller.resources -- The resources block for the controller pods resources: - limits: - cpu: 25m - memory: 256Mi + limits: {} requests: cpu: 25m memory: 256Mi # controller.podSecurityContext -- Defines the podSecurityContext for the controller pod - podSecurityContext: {} + podSecurityContext: + seccompProfile: + type: RuntimeDefault # controller.securityContext -- The container securityContext for the controller container securityContext: readOnlyRootFilesystem: true @@ -160,14 +160,14 @@ dashboard: # dashboard.resources -- A resources block for the dashboard. resources: - limits: - cpu: 25m - memory: 256Mi + limits: {} requests: cpu: 25m memory: 256Mi # dashboard.podSecurityContext -- Defines the podSecurityContext for the dashboard pod - podSecurityContext: {} + podSecurityContext: + seccompProfile: + type: RuntimeDefault # dashboard.securityContext -- The container securityContext for the dashboard container securityContext: readOnlyRootFilesystem: true diff --git a/goldilocks/Chart.lock b/goldilocks/Chart.lock index 936985f..564ced1 100644 --- a/goldilocks/Chart.lock +++ b/goldilocks/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: vpa repository: https://charts.fairwinds.com/stable - version: 2.5.1 + version: 3.0.2 - name: metrics-server repository: https://charts.bitnami.com/bitnami version: 6.4.1 -digest: sha256:358718baff45656e3b4a9fa0cddb5c17717041839542aa223620002e55e5ce26 -generated: "2023-09-05T15:36:02.054719-06:00" +digest: sha256:7a923abb2a353b828b45e0ae502ac0bb21b009312490ff7f4b50aebc9a29bea0 +generated: "2023-10-27T11:14:25.826905956+09:00" diff --git a/goldilocks/Chart.yaml b/goldilocks/Chart.yaml index 4b9b814..417fe81 100644 --- a/goldilocks/Chart.yaml +++ b/goldilocks/Chart.yaml @@ -4,7 +4,7 @@ dependencies: - condition: vpa.enabled name: vpa repository: https://charts.fairwinds.com/stable - version: 2.5.* + version: 3.0.* - condition: metrics-server.enabled name: metrics-server repository: https://charts.bitnami.com/bitnami @@ -22,4 +22,4 @@ maintainers: name: goldilocks sources: - https://github.com/FairwindsOps/goldilocks -version: 7.3.1 +version: 8.0.1 diff --git a/goldilocks/charts/vpa/Chart.yaml b/goldilocks/charts/vpa/Chart.yaml index 88970d2..4493305 100644 --- a/goldilocks/charts/vpa/Chart.yaml +++ b/goldilocks/charts/vpa/Chart.yaml @@ -16,4 +16,4 @@ sources: - https://github.com/FairwindsOps/charts/tree/master/stable/vpa - https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler type: application -version: 2.5.1 +version: 3.0.2 diff --git a/goldilocks/charts/vpa/README.md b/goldilocks/charts/vpa/README.md index 21821bb..0d25fb2 100644 --- a/goldilocks/charts/vpa/README.md +++ b/goldilocks/charts/vpa/README.md @@ -25,6 +25,32 @@ The admissionController is the only one that poses a stability consideration bec For more details, please see the values below, and the vertical pod autosclaer documentation. +## *BREAKING* Upgrading from <= v2.5.1 to 3.0.0 + +### ClusterRole rules + +Previously, ClusterRoles were created by default from templates and could not be extended with custom rules. Since `3.0.0` version it is possible. + +You can define it as follows: + +```yaml +rbac: + extraRules: + vpaActor: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + vpaCheckpointActor: [] + vpaEvictioner: [] + vpaMetricsReader: [] + vpaTargetReader: [] + vpaStatusReader: [] + +``` + ## *BREAKING* Upgrading from <= v1.7.x to 2.0.0 ### Certificate generation @@ -107,7 +133,14 @@ recommender: | nameOverride | string | `""` | A template override for the name | | fullnameOverride | string | `""` | A template override for the fullname | | podLabels | object | `{}` | Labels to add to all pods | -| rbac.create | bool | `true` | If true, then rbac resources (clusterroles and clusterrolebindings) will be created for the selected components. Temporary rbac resources will still be created, to ensure a functioning installation process | +| rbac.create | bool | `true` | If true, then rbac resources (ClusterRoles and ClusterRoleBindings) will be created for the selected components. Temporary rbac resources will still be created, to ensure a functioning installation process | +| rbac.extraRules | object | `{"vpaActor":[],"vpaCheckpointActor":[],"vpaEvictioner":[],"vpaMetricsReader":[],"vpaStatusReader":[],"vpaTargetReader":[]}` | Extra rbac rules for ClusterRoles | +| rbac.extraRules.vpaActor | list | `[]` | Extra rbac rules for the vpa-actor ClusterRole | +| rbac.extraRules.vpaCheckpointActor | list | `[]` | Extra rbac rules for the vpa-checkpoint-actor ClusterRole | +| rbac.extraRules.vpaEvictioner | list | `[]` | Extra rbac rules for the vpa-evictioner ClusterRole | +| rbac.extraRules.vpaMetricsReader | list | `[]` | Extra rbac rules for the vpa-metrics-reader ClusterRole | +| rbac.extraRules.vpaTargetReader | list | `[]` | Extra rbac rules for the vpa-target-reader ClusterRole | +| rbac.extraRules.vpaStatusReader | list | `[]` | Extra rbac rules for the vpa-status-reader ClusterRole | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created for each component | | serviceAccount.annotations | object | `{}` | Annotations to add to the service accounts for each component | | serviceAccount.name | string | `""` | The base name of the service account to use (appended with the component). If not set and create is true, a name is generated using the fullname template and appended for each component | diff --git a/goldilocks/charts/vpa/README.md.gotmpl b/goldilocks/charts/vpa/README.md.gotmpl index 58e6bbe..235cb26 100644 --- a/goldilocks/charts/vpa/README.md.gotmpl +++ b/goldilocks/charts/vpa/README.md.gotmpl @@ -25,6 +25,32 @@ The admissionController is the only one that poses a stability consideration bec For more details, please see the values below, and the vertical pod autosclaer documentation. +## *BREAKING* Upgrading from <= v2.5.1 to 3.0.0 + +### ClusterRole rules + +Previously, ClusterRoles were created by default from templates and could not be extended with custom rules. Since `3.0.0` version it is possible. + +You can define it as follows: + +```yaml +rbac: + extraRules: + vpaActor: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + vpaCheckpointActor: [] + vpaEvictioner: [] + vpaMetricsReader: [] + vpaTargetReader: [] + vpaStatusReader: [] + +``` + ## *BREAKING* Upgrading from <= v1.7.x to 2.0.0 ### Certificate generation diff --git a/goldilocks/charts/vpa/ci/test-values.yaml b/goldilocks/charts/vpa/ci/test-values.yaml index 84efcd7..719b666 100644 --- a/goldilocks/charts/vpa/ci/test-values.yaml +++ b/goldilocks/charts/vpa/ci/test-values.yaml @@ -1,3 +1,59 @@ +rbac: + extraRules: + vpaActor: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch + vpaCheckpointActor: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch + vpaEvictioner: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch + vpaMetricsReader: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch + vpaTargetReader: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch + vpaStatusReader: + - apiGroups: + - batch + resources: + - '*' + verbs: + - get + - list + - watch recommender: enabled: true annotations: diff --git a/goldilocks/charts/vpa/templates/clusterroles.yaml b/goldilocks/charts/vpa/templates/clusterroles.yaml index 8e82657..94834ae 100644 --- a/goldilocks/charts/vpa/templates/clusterroles.yaml +++ b/goldilocks/charts/vpa/templates/clusterroles.yaml @@ -12,6 +12,9 @@ rules: verbs: - get - list + {{- if .Values.rbac.extraRules.vpaMetricsReader -}} + {{ toYaml .Values.rbac.extraRules.vpaMetricsReader | nindent 2 }} + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -55,6 +58,9 @@ rules: - list - watch - patch + {{- if .Values.rbac.extraRules.vpaActor -}} + {{ toYaml .Values.rbac.extraRules.vpaActor | nindent 2 }} + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -90,6 +96,9 @@ rules: verbs: - get - list + {{- if .Values.rbac.extraRules.vpaCheckpointActor -}} + {{ toYaml .Values.rbac.extraRules.vpaCheckpointActor | nindent 2 }} + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -109,6 +118,9 @@ rules: - pods/eviction verbs: - create + {{- if .Values.rbac.extraRules.vpaEvictioner -}} + {{ toYaml .Values.rbac.extraRules.vpaEvictioner | nindent 2 }} + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -150,6 +162,9 @@ rules: - get - list - watch + {{- if .Values.rbac.extraRules.vpaTargetReader -}} + {{ toYaml .Values.rbac.extraRules.vpaTargetReader | nindent 2 }} + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -164,4 +179,7 @@ rules: - get - list - watch + {{- if .Values.rbac.extraRules.vpaStatusReader -}} + {{ toYaml .Values.rbac.extraRules.vpaStatusReader | nindent 2 }} + {{- end }} {{- end }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml index 4d163c0..ed1a8b2 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrole.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: admission-certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml index 12e1f96..056bd16 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-clusterrolebinding.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: admission-certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-create.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-create.yaml index 1b7757a..0b568b4 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-create.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-create.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-role.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-role.yaml index 9fba851..ee7e565 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-role.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-role.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: admission-certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml index 8f15a50..67cd399 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-rolebinding.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: admission-certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml index bb50d2e..0977974 100644 --- a/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/jobs/certgen-sa.yaml @@ -6,6 +6,7 @@ metadata: annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "-110" labels: app.kubernetes.io/component: admission-certgen {{- include "vpa.labels" . | nindent 4 }} diff --git a/goldilocks/charts/vpa/templates/webhooks/mutating.yaml b/goldilocks/charts/vpa/templates/webhooks/mutating.yaml index 03776ab..64a8107 100644 --- a/goldilocks/charts/vpa/templates/webhooks/mutating.yaml +++ b/goldilocks/charts/vpa/templates/webhooks/mutating.yaml @@ -21,8 +21,8 @@ webhooks: failurePolicy: {{ .Values.admissionController.mutatingWebhookConfiguration.failurePolicy }} matchPolicy: Equivalent name: vpa.k8s.io - namespaceSelector: {{ .Values.admissionController.mutatingWebhookConfiguration.namespaceSelector | toYaml }} - objectSelector: {{ .Values.admissionController.mutatingWebhookConfiguration.objectSelector | toYaml }} + namespaceSelector: {{ .Values.admissionController.mutatingWebhookConfiguration.namespaceSelector | toYaml | nindent 4 }} + objectSelector: {{ .Values.admissionController.mutatingWebhookConfiguration.objectSelector | toYaml | nindent 4 }} reinvocationPolicy: Never rules: - apiGroups: diff --git a/goldilocks/charts/vpa/values.yaml b/goldilocks/charts/vpa/values.yaml index 89cde5f..a1293a5 100644 --- a/goldilocks/charts/vpa/values.yaml +++ b/goldilocks/charts/vpa/values.yaml @@ -13,9 +13,23 @@ fullnameOverride: "" # podLabels -- Labels to add to all pods podLabels: {} rbac: - # rbac.create -- If true, then rbac resources (clusterroles and clusterrolebindings) will be created for the selected components. + # rbac.create -- If true, then rbac resources (ClusterRoles and ClusterRoleBindings) will be created for the selected components. # Temporary rbac resources will still be created, to ensure a functioning installation process create: true + # rbac.extraRules -- Extra rbac rules for ClusterRoles + extraRules: + # rbac.extraRules.vpaActor -- Extra rbac rules for the vpa-actor ClusterRole + vpaActor: [] + # rbac.extraRules.vpaCheckpointActor -- Extra rbac rules for the vpa-checkpoint-actor ClusterRole + vpaCheckpointActor: [] + # rbac.extraRules.vpaEvictioner -- Extra rbac rules for the vpa-evictioner ClusterRole + vpaEvictioner: [] + # rbac.extraRules.vpaMetricsReader -- Extra rbac rules for the vpa-metrics-reader ClusterRole + vpaMetricsReader: [] + # rbac.extraRules.vpaTargetReader -- Extra rbac rules for the vpa-target-reader ClusterRole + vpaTargetReader: [] + # rbac.extraRules.vpaStatusReader -- Extra rbac rules for the vpa-status-reader ClusterRole + vpaStatusReader: [] serviceAccount: # serviceAccount.create -- Specifies whether a service account should be created for each component diff --git a/goldilocks/templates/controller-deployment.yaml b/goldilocks/templates/controller-deployment.yaml index 818db55..c0a1fdd 100644 --- a/goldilocks/templates/controller-deployment.yaml +++ b/goldilocks/templates/controller-deployment.yaml @@ -19,9 +19,7 @@ metadata: {{- end }} spec: replicas: 1 - {{- if .Values.controller.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.controller.revisionHistoryLimit }} - {{- end }} selector: matchLabels: app.kubernetes.io/name: {{ include "goldilocks.name" . }} diff --git a/goldilocks/templates/dashboard-deployment.yaml b/goldilocks/templates/dashboard-deployment.yaml index 585ce25..633dda6 100644 --- a/goldilocks/templates/dashboard-deployment.yaml +++ b/goldilocks/templates/dashboard-deployment.yaml @@ -19,9 +19,7 @@ metadata: {{- end }} spec: replicas: {{ .Values.dashboard.replicaCount }} - {{- if .Values.dashboard.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.dashboard.revisionHistoryLimit }} - {{- end }} selector: matchLabels: app.kubernetes.io/name: {{ include "goldilocks.name" . }} diff --git a/goldilocks/values-home.yaml b/goldilocks/values-home.yaml index e2c06f7..548ab12 100644 --- a/goldilocks/values-home.yaml +++ b/goldilocks/values-home.yaml @@ -17,7 +17,7 @@ image: # image.repository -- Repository for the goldilocks image repository: us-docker.pkg.dev/fairwinds-ops/oss/goldilocks # image.tag -- The goldilocks image tag to use - tag: v4.9.0 + tag: v4.10.0 # image.pullPolicy -- imagePullPolicy - Highly recommended to leave this as `Always` pullPolicy: Always @@ -61,13 +61,14 @@ controller: topologySpreadConstraints: [] # controller.resources -- The resources block for the controller pods resources: - limits: - memory: 256Mi + limits: {} requests: cpu: 25m memory: 256Mi # controller.podSecurityContext -- Defines the podSecurityContext for the controller pod - podSecurityContext: {} + podSecurityContext: + seccompProfile: + type: RuntimeDefault # controller.securityContext -- The container securityContext for the controller container securityContext: readOnlyRootFilesystem: true @@ -146,9 +147,6 @@ dashboard: annotations: kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" - nginx.ingress.kubernetes.io/auth-signin: https://$host/oauth2/start?rd=$escaped_request_uri - nginx.ingress.kubernetes.io/auth-url: https://$host/oauth2/auth - nginx.ingress.kubernetes.io/backend-protocol: HTTP hosts: - host: goldilocks.ervine.cloud paths: @@ -163,12 +161,14 @@ dashboard: # dashboard.resources -- A resources block for the dashboard. resources: limits: - memory: 256Mi + memory: 512Mi requests: cpu: 25m memory: 256Mi # dashboard.podSecurityContext -- Defines the podSecurityContext for the dashboard pod - podSecurityContext: {} + podSecurityContext: + seccompProfile: + type: RuntimeDefault # dashboard.securityContext -- The container securityContext for the dashboard container securityContext: readOnlyRootFilesystem: true