diff --git a/charts/funkwhale/templates/ingress.yaml b/charts/funkwhale/templates/ingress.yaml index 29afaa9..46b0228 100644 --- a/charts/funkwhale/templates/ingress.yaml +++ b/charts/funkwhale/templates/ingress.yaml @@ -1,7 +1,11 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "funkwhale.fullname" . -}} --- +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} apiVersion: extensions/v1beta1 +{{- end }} kind: Ingress metadata: name: {{ $fullName }} diff --git a/charts/netbox/Chart.lock b/charts/netbox/Chart.lock new file mode 100644 index 0000000..5b0d1ba --- /dev/null +++ b/charts/netbox/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: redis + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 10.3.4 +digest: sha256:5847f69672e640d401e2242d18acbefc0c06f4b6731d4c760bc5947fb7010434 +generated: "2020-01-23T10:15:20.020312019+01:00" diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml index 71a95bd..accd028 100644 --- a/charts/netbox/Chart.yaml +++ b/charts/netbox/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v1 -appVersion: "2.6.7" +appVersion: "2.7.2" description: An IP address management (IPAM) and data center infrastructure management (DCIM) tool. icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico name: netbox -version: 0.3.5 +version: 0.4.1 diff --git a/charts/netbox/charts/redis-10.3.4.tgz b/charts/netbox/charts/redis-10.3.4.tgz new file mode 100644 index 0000000..be616f2 Binary files /dev/null and b/charts/netbox/charts/redis-10.3.4.tgz differ diff --git a/charts/netbox/charts/redis-7.1.1.tgz b/charts/netbox/charts/redis-7.1.1.tgz deleted file mode 100644 index 2efbd47..0000000 Binary files a/charts/netbox/charts/redis-7.1.1.tgz and /dev/null differ diff --git a/charts/netbox/requirements.lock b/charts/netbox/requirements.lock deleted file mode 100644 index fbe7115..0000000 --- a/charts/netbox/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: redis - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 7.1.1 -digest: sha256:5a2449433325c0e819134bdcd7bd7ab463975b9b529c8516a9ff030547140bf6 -generated: 2019-05-21T09:47:18.817171504+02:00 diff --git a/charts/netbox/requirements.yaml b/charts/netbox/requirements.yaml index 62f4546..3107031 100644 --- a/charts/netbox/requirements.yaml +++ b/charts/netbox/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: redis - version: 7.1.1 + version: 10.3.4 repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml new file mode 100644 index 0000000..4c3a8e7 --- /dev/null +++ b/charts/netbox/templates/deployment-worker.yaml @@ -0,0 +1,56 @@ +{{- if .Values.worker.enabled }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "netbox.fullname" . }}-worker + labels: + app.kubernetes.io/name: {{ include "netbox.name" . }} + helm.sh/chart: {{ include "netbox.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + replicas: {{ .Values.worker.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "netbox.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + component: worker + template: + metadata: + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }} + checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} + labels: + app.kubernetes.io/name: {{ include "netbox.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + component: worker + spec: + containers: + - name: {{ .Chart.Name }}-worker + command: + - python3 + - /opt/netbox/netbox/manage.py + - rqworker + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + envFrom: + - configMapRef: + name: {{ include "netbox.fullname" . }} + - secretRef: + name: {{ include "netbox.fullname" . }} + resources: + {{- toYaml .Values.worker.resources | nindent 12 }} + {{- with .Values.worker.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.worker.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.worker.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml index afdc94c..1fd68ed 100644 --- a/charts/netbox/templates/deployment.yaml +++ b/charts/netbox/templates/deployment.yaml @@ -14,6 +14,7 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "netbox.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + component: app template: metadata: annotations: @@ -22,6 +23,7 @@ spec: labels: app.kubernetes.io/name: {{ include "netbox.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + component: app spec: containers: - name: {{ .Chart.Name }} diff --git a/charts/netbox/templates/ingress.yaml b/charts/netbox/templates/ingress.yaml index 42f2ac7..dc5a355 100644 --- a/charts/netbox/templates/ingress.yaml +++ b/charts/netbox/templates/ingress.yaml @@ -1,6 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "netbox.fullname" . -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} apiVersion: extensions/v1beta1 +{{- end }} kind: Ingress metadata: name: {{ $fullName }} diff --git a/charts/netbox/templates/service.yaml b/charts/netbox/templates/service.yaml index b6f9ba5..b657c73 100644 --- a/charts/netbox/templates/service.yaml +++ b/charts/netbox/templates/service.yaml @@ -18,3 +18,4 @@ spec: selector: app.kubernetes.io/name: {{ include "netbox.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + component: app diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml index fa9a029..d857cef 100644 --- a/charts/netbox/values.yaml +++ b/charts/netbox/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: netboxcommunity/netbox - tag: v2.6.7-ldap + tag: v2.7.2-ldap pullPolicy: Always nameOverride: "" @@ -83,10 +83,6 @@ superuser: password: '' resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. # limits: # cpu: 100m # memory: 128Mi @@ -116,15 +112,11 @@ persistence: size: 10Gi worker: - enabled: false + enabled: true replicaCount: 1 resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. # limits: # cpu: 100m # memory: 128Mi diff --git a/charts/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml index f6478c7..afc1c29 100644 --- a/charts/radosgw/templates/ingress.yaml +++ b/charts/radosgw/templates/ingress.yaml @@ -1,6 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "radosgw.fullname" . -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} apiVersion: extensions/v1beta1 +{{- end }} kind: Ingress metadata: name: {{ $fullName }}