Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
saramune committed Jul 24, 2024
1 parent 5ca5797 commit a9e317a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 67 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KIND_VERSION = 0.23.0
KUBERNETES_VERSION = 1.30.0
KIND_NODE_HASH = 047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
HELM_VERSION = 3.15.1
KIND_VERSION = 0.20.0
KUBERNETES_VERSION = 1.28.0
KIND_NODE_HASH = b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
HELM_VERSION = 3.13.2
KUBEVAL_VERSION = 0.16.1

.PHONY: apply
Expand Down
2 changes: 1 addition & 1 deletion akka/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.19
version: 0.2.18

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
Expand Down
4 changes: 2 additions & 2 deletions akka/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
RELEASE = $$(basename $$PWD)

.PHONY: install
install:
helm upgrade -i --set replicaCount=2 --wait $(RELEASE) .
helm upgrade -i --set replicaCount=3 --wait $(RELEASE) .

.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
Expand Down
16 changes: 16 additions & 0 deletions akka/atlantis-efs-pv-1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v1
kind: PersistentVolume
metadata:
name: atlantis-efs-pv-1
spec:
accessModes:
- ReadWriteOnce
- ReadWriteMany
capacity:
storage: 100Gi
csi:
driver: efs.csi.aws.com
volumeHandle: fs-061819ef222a100b2
persistentVolumeReclaimPolicy: Retain
storageClassName: atlantis-efs-sc-1
volumeMode: Filesystem
32 changes: 0 additions & 32 deletions akka/templates/autoscaling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
28 changes: 0 additions & 28 deletions akka/templates/rollout.yaml
Original file line number Diff line number Diff line change
@@ -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 }}

0 comments on commit a9e317a

Please sign in to comment.