diff --git a/akka/Chart.yaml b/akka/Chart.yaml index c9fce21e..e2f32855 100644 --- a/akka/Chart.yaml +++ b/akka/Chart.yaml @@ -14,7 +14,7 @@ type: application # 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. -version: 0.2.18 +version: 0.2.20 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/akka/Makefile b/akka/Makefile index e838ceaf..b40e0d79 100644 --- a/akka/Makefile +++ b/akka/Makefile @@ -4,6 +4,7 @@ RELEASE = $$(basename $$PWD) .PHONY: install install: helm upgrade -i --set replicaCount=3 --wait $(RELEASE) . + for pod in $$(kubectl get po -n akka | grep akka | cut -d ' ' -f 1); do kubectl logs $$pod -n akka; sleep 3; done .PHONY: lint lint: lint-default lint-local-akka-http lint-cluster-discovery-dns lint-cluster-discovery-kubernetes-api lint-cluster-discovery-aggregate lint-cluster-multi-eks-cluster lint-use-environment-variable-and-secret diff --git a/akka/templates/autoscaling.yaml b/akka/templates/autoscaling.yaml index f4117686..d347b554 100644 --- a/akka/templates/autoscaling.yaml +++ b/akka/templates/autoscaling.yaml @@ -29,35 +29,3 @@ spec: apiVersion: apps/v1 name: "{{ template "akka.fullname" . }}" {{- end }} - -{{- if .Values.autoscalingRollout.enabled -}} ---- -{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion }} -apiVersion: autoscaling/v2 -{{- else }} -apiVersion: autoscaling/v2beta2 -{{- end }} -kind: HorizontalPodAutoscaler -metadata: - annotations: - {{- toYaml .Values.autoscalingRollout.annotations | nindent 4}} - labels: - {{- include "akka.labels" . | nindent 4 }} - {{- with .Values.autoscalingRollout.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - name: "{{ template "akka.fullname" . }}" -spec: - {{- with .Values.autoscalingRollout.behavior }} - behavior: - {{- toYaml . | nindent 4 }} - {{- end }} - maxReplicas: {{ .Values.autoscalingRollout.maxReplicas }} - metrics: - {{- toYaml .Values.autoscalingRollout.metrics | nindent 4 }} - minReplicas: {{ .Values.autoscalingRollout.minReplicas }} - scaleTargetRef: - kind: Rollout - apiVersion: argoproj.io/v1alpha1 - name: "{{ template "akka.fullname" . }}" -{{- end }} \ No newline at end of file diff --git a/akka/templates/rollout.yaml b/akka/templates/rollout.yaml index 9375d87d..e69de29b 100644 --- a/akka/templates/rollout.yaml +++ b/akka/templates/rollout.yaml @@ -1,28 +0,0 @@ -{{- $root := . -}} -{{- if .Values.rollout.enabled -}} -apiVersion: argoproj.io/v1alpha1 -kind: Rollout -metadata: - name: "{{ include "akka.containerName" . }}" - labels: - {{- include "akka.labels" . | nindent 4 }} - {{- with .Values.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.rollout.workloadRef.enabled }} - workloadRef: - apiVersion: apps/v1 - kind: Deployment - name: "{{ include "akka.containerName" . }}" - {{- else }} - template: - {{- toYaml .Values.rollout.template | nindent 4 }} - {{- end }} - {{- if and (not .Values.autoscalingRollout.enabled) (ne .Values.rollout.replicaCount nil) }} - replicas: {{ .Values.rollout.replicaCount }} - {{- end }} - revisionHistoryLimit: {{ .Values.rollout.revisionHistoryLimit }} - strategy: - {{- toYaml .Values.rollout.strategy | nindent 4 }} -{{- end }} \ No newline at end of file