Get AMI data from helm value rather than from hardcoded string in the… (

#3599)

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

* Get AMI data from helm value rather than from hardcoded string in the code.

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Get AMI data from helm value rather than from hardcoded string in the code.
+
 ## [14.21.0] - 2023-09-01
 
 ## [14.20.0] - 2023-08-29

helm/aws-operator/templates/configmap.yaml

@@ -96,3 +96,5 @@ data:
         {{- end }}
       kubernetes:
         incluster: true
+  ami.json: |
+    {{- .Values.aws.amiJSON |nindent 4 }}

helm/aws-operator/templates/deployment.yaml

@@ -27,6 +27,12 @@ spec:
           items:
           - key: config.yaml
             path: config.yaml
+      - name: {{ include "name" . }}-ami
+        configMap:
+          name: {{ include "resource.default.name"  . }}
+          items:
+            - key: ami.json
+              path: ami.json
       - name: {{ include "name" . }}-secret
         secret:
           secretName: {{ include "resource.default.name"  . }}
@@ -51,6 +57,9 @@ spec:
         volumeMounts:
         - name: {{ include "name" . }}-configmap
           mountPath: /var/run/{{ include "name" . }}/configmap/
+        - name: {{ include "name" . }}-ami
+          mountPath: /tmp/ami.json
+          subPath: ami.json
         - name: {{ include "name" . }}-secret
           mountPath: /var/run/{{ include "name" . }}/secret/
           readOnly: true

helm/aws-operator/values.yaml

@@ -25,7 +25,7 @@ aws:
     enabled: false
   vault:
     address: "http://localhost:8200"
-
+  amiJSON: "{}"
 tenant:
   cni:
     mask: 16

service/controller/key/common.go

@@ -1,7 +1,9 @@
 package key
 
 import (
+	"encoding/json"
 	"fmt"
+	"os"
 	"strings"
 	"time"
 	"unicode"
@@ -36,8 +38,12 @@ const (
 	ServiceAccountV2Priv = "key"
 
 	V19AlphaRelease = "19.0.0-alpha1"
+
+	amiFilePath = "/tmp/ami.json"
 )
 
+var amiInfo = map[string]map[string]string{}
+
 const (
 	// TerminateUnhealthyNodeResyncPeriod defines resync period for the terminateunhealthynode controller
 	TerminateUnhealthyNodeResyncPeriod = time.Minute * 3
@@ -67,6 +73,25 @@ const sslOnlyBucketPolicyTemplate = `{
   ]
 }`
 
+func loadAMIs() error {
+	// Data already there, avoid reloading from file.
+	if len(amiInfo) > 0 {
+		return nil
+	}
+
+	amiJSON, err := os.ReadFile(amiFilePath)
+	if err != nil {
+		return microerror.Mask(err)
+	}
+
+	err = json.Unmarshal(amiJSON, &amiInfo)
+	if err != nil {
+		return microerror.Mask(err)
+	}
+
+	return nil
+}
+
 // AMI returns the EC2 AMI for the configured region and given version.
 func AMI(region string, release releasev1alpha1.Release, flatcarReleaseVersion string) (string, error) {
 
@@ -82,6 +107,11 @@ func AMI(region string, release releasev1alpha1.Release, flatcarReleaseVersion s
 		osVersion = flatcarReleaseVersion
 	}
 
+	err = loadAMIs()
+	if err != nil {
+		return "", microerror.Mask(err)
+	}
+
 	regionAMIs, ok := amiInfo[osVersion]
 	if !ok {
 		return "", microerror.Maskf(notFoundError, "no image id for version '%s'", osVersion)