Fix chart

This commit is contained in:
2024-01-05 11:40:27 +00:00
parent 249ccb1dac
commit 2bccb0e8b8
6 changed files with 66 additions and 53 deletions
+1 -1
View File
@@ -163,7 +163,7 @@ $(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
helmify: helmify:
$(call go-get-tool,$(HELMIFY),github.com/arttor/helmify/cmd/helmify@v0.3.7) $(call go-get-tool,$(HELMIFY),github.com/arttor/helmify/cmd/helmify@v0.4.10)
helm: manifests kustomize helmify helm: manifests kustomize helmify
$(KUSTOMIZE) build config/default | $(HELMIFY) $(KUSTOMIZE) build config/default | $(HELMIFY)
+2 -2
View File
@@ -13,12 +13,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.30 version: 0.0.32
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "0.0.30" appVersion: "0.0.32"
keywords: keywords:
- operator - operator
- jobs - jobs
@@ -1,13 +1,3 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "chart.fullname" . }}-controller-manager
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: jobs-manager-operator
app.kubernetes.io/part-of: jobs-manager-operator
{{- include "chart.labels" . | nindent 4 }}
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@@ -49,16 +39,11 @@ spec:
values: values:
- linux - linux
containers: containers:
- args: - args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent 8 }}
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=0
env: env:
- name: KUBERNETES_CLUSTER_DOMAIN - name: KUBERNETES_CLUSTER_DOMAIN
value: {{ .Values.kubernetesClusterDomain }} value: {{ quote .Values.kubernetesClusterDomain }}
image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag | default .Chart.AppVersion }}
| default .Chart.AppVersion }}
name: kube-rbac-proxy name: kube-rbac-proxy
ports: ports:
- containerPort: 8443 - containerPort: 8443
@@ -66,22 +51,15 @@ spec:
protocol: TCP protocol: TCP
resources: {{- toYaml .Values.controllerManager.kubeRbacProxy.resources | nindent resources: {{- toYaml .Values.controllerManager.kubeRbacProxy.resources | nindent
10 }} 10 }}
securityContext: securityContext: {{- toYaml .Values.controllerManager.kubeRbacProxy.containerSecurityContext
allowPrivilegeEscalation: false | nindent 10 }}
capabilities: - args: {{- toYaml .Values.controllerManager.manager.args | nindent 8 }}
drop:
- ALL
- args:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
command: command:
- /manager - /manager
env: env:
- name: KUBERNETES_CLUSTER_DOMAIN - name: KUBERNETES_CLUSTER_DOMAIN
value: {{ .Values.kubernetesClusterDomain }} value: {{ quote .Values.kubernetesClusterDomain }}
image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag | default .Chart.AppVersion }}
| default .Chart.AppVersion }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
@@ -95,13 +73,8 @@ spec:
port: 8081 port: 8081
initialDelaySeconds: 5 initialDelaySeconds: 5
periodSeconds: 10 periodSeconds: 10
resources: {{- toYaml .Values.controllerManager.manager.resources | nindent 10 resources: {{- toYaml .Values.controllerManager.manager.resources | nindent 10 }}
}} securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext | nindent 10 }}
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
serviceAccountName: {{ include "chart.fullname" . }}-controller-manager serviceAccountName: {{ include "chart.fullname" . }}-controller-manager
@@ -747,7 +747,7 @@ spec:
and the sum of memory limits of all containers and the sum of memory limits of all containers
in a pod. The default is nil which means in a pod. The default is nil which means
that the limit is undefined. More info: that the limit is undefined. More info:
http://kubernetes.io/docs/user-guide/volumes#emptydir' https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
type: object type: object
@@ -962,7 +962,8 @@ spec:
\n This is an alpha field and \n This is an alpha field and
requires enabling the DynamicResourceAllocation requires enabling the DynamicResourceAllocation
feature gate. \n This field feature gate. \n This field
is immutable." is immutable. It can only be
set for containers."
items: items:
description: ResourceClaim references description: ResourceClaim references
one entry in PodSpec.ResourceClaims. one entry in PodSpec.ResourceClaims.
@@ -1009,7 +1010,8 @@ spec:
it defaults to Limits if that it defaults to Limits if that
is explicitly specified, otherwise is explicitly specified, otherwise
to an implementation-defined to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' value. Requests cannot exceed
Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
@@ -2827,7 +2829,7 @@ spec:
and the sum of memory limits of all containers and the sum of memory limits of all containers
in a pod. The default is nil which means in a pod. The default is nil which means
that the limit is undefined. More info: that the limit is undefined. More info:
http://kubernetes.io/docs/user-guide/volumes#emptydir' https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
type: object type: object
@@ -3042,7 +3044,8 @@ spec:
\n This is an alpha field and \n This is an alpha field and
requires enabling the DynamicResourceAllocation requires enabling the DynamicResourceAllocation
feature gate. \n This field feature gate. \n This field
is immutable." is immutable. It can only be
set for containers."
items: items:
description: ResourceClaim references description: ResourceClaim references
one entry in PodSpec.ResourceClaims. one entry in PodSpec.ResourceClaims.
@@ -3089,7 +3092,8 @@ spec:
it defaults to Limits if that it defaults to Limits if that
is explicitly specified, otherwise is explicitly specified, otherwise
to an implementation-defined to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' value. Requests cannot exceed
Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
@@ -4856,7 +4860,7 @@ spec:
be the minimum value between the SizeLimit specified be the minimum value between the SizeLimit specified
here and the sum of memory limits of all containers here and the sum of memory limits of all containers
in a pod. The default is nil which means that in a pod. The default is nil which means that
the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' the limit is undefined. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
type: object type: object
@@ -5051,7 +5055,8 @@ spec:
that are used by this container. \n that are used by this container. \n
This is an alpha field and requires This is an alpha field and requires
enabling the DynamicResourceAllocation enabling the DynamicResourceAllocation
feature gate. \n This field is immutable." feature gate. \n This field is immutable.
It can only be set for containers."
items: items:
description: ResourceClaim references description: ResourceClaim references
one entry in PodSpec.ResourceClaims. one entry in PodSpec.ResourceClaims.
@@ -5094,7 +5099,8 @@ spec:
a container, it defaults to Limits a container, it defaults to Limits
if that is explicitly specified, otherwise if that is explicitly specified, otherwise
to an implementation-defined value. to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More
info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
@@ -6747,7 +6753,7 @@ spec:
between the SizeLimit specified here and the sum of between the SizeLimit specified here and the sum of
memory limits of all containers in a pod. The default memory limits of all containers in a pod. The default
is nil which means that the limit is undefined. More is nil which means that the limit is undefined. More
info: http://kubernetes.io/docs/user-guide/volumes#emptydir' info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
type: object type: object
@@ -6925,7 +6931,8 @@ spec:
defined in spec.resourceClaims, that are defined in spec.resourceClaims, that are
used by this container. \n This is an alpha used by this container. \n This is an alpha
field and requires enabling the DynamicResourceAllocation field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable." feature gate. \n This field is immutable.
It can only be set for containers."
items: items:
description: ResourceClaim references one description: ResourceClaim references one
entry in PodSpec.ResourceClaims. entry in PodSpec.ResourceClaims.
@@ -6967,7 +6974,8 @@ spec:
Requests is omitted for a container, it Requests is omitted for a container, it
defaults to Limits if that is explicitly defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' value. Requests cannot exceed Limits. More
info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
@@ -0,0 +1,11 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "chart.fullname" . }}-controller-manager
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: jobs-manager-operator
app.kubernetes.io/part-of: jobs-manager-operator
{{- include "chart.labels" . | nindent 4 }}
annotations:
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
+22 -1
View File
@@ -1,5 +1,15 @@
controllerManager: controllerManager:
kubeRbacProxy: kubeRbacProxy:
args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=0
containerSecurityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
image: image:
repository: gcr.io/kubebuilder/kube-rbac-proxy repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.13.1 tag: v0.13.1
@@ -11,9 +21,18 @@ controllerManager:
cpu: 5m cpu: 5m
memory: 64Mi memory: 64Mi
manager: manager:
args:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
containerSecurityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
image: image:
repository: ghcr.io/lukaszraczylo/jobs-manager-operator repository: ghcr.io/lukaszraczylo/jobs-manager-operator
tag: latest tag: 0.0.32
resources: resources:
limits: limits:
cpu: 500m cpu: 500m
@@ -22,6 +41,8 @@ controllerManager:
cpu: 10m cpu: 10m
memory: 64Mi memory: 64Mi
replicas: 1 replicas: 1
serviceAccount:
annotations: {}
kubernetesClusterDomain: cluster.local kubernetesClusterDomain: cluster.local
metricsService: metricsService:
ports: ports: