From a9e317a8ab29995988202495a43071f9d8b3889a Mon Sep 17 00:00:00 2001
From: Keisuke Furuya <si17erad0@gmail.com>
Date: Wed, 24 Jul 2024 14:44:32 +0900
Subject: [PATCH] test

---
 Makefile                        |  8 ++++----
 akka/Chart.yaml                 |  2 +-
 akka/Makefile                   |  4 ++--
 akka/atlantis-efs-pv-1.yaml     | 16 ++++++++++++++++
 akka/templates/autoscaling.yaml | 32 --------------------------------
 akka/templates/rollout.yaml     | 28 ----------------------------
 6 files changed, 23 insertions(+), 67 deletions(-)
 create mode 100644 akka/atlantis-efs-pv-1.yaml

diff --git a/Makefile b/Makefile
index e708bb36..e8a76f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/akka/Chart.yaml b/akka/Chart.yaml
index 706ebeb3..c9fce21e 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.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.
diff --git a/akka/Makefile b/akka/Makefile
index a221141c..2cbdec93 100644
--- a/akka/Makefile
+++ b/akka/Makefile
@@ -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
diff --git a/akka/atlantis-efs-pv-1.yaml b/akka/atlantis-efs-pv-1.yaml
new file mode 100644
index 00000000..c2803fa9
--- /dev/null
+++ b/akka/atlantis-efs-pv-1.yaml
@@ -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
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