diff --git a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/eks-cluster.yaml b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/eks-cluster.yaml index fad1a274119be8134a3d6a6e5855c453e9781c16..1991447cd26b92ec817faf46097de274437c209e 100644 --- a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/eks-cluster.yaml +++ b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/eks-cluster.yaml @@ -1,15 +1,15 @@ apiVersion: eks.aws.crossplane.io/v1beta1 kind: Cluster metadata: - name: {{ .Chart.Name }} + name: {{ .Release.Name }} labels: provider: aws cluster: eks chart: {{ .Chart.Name }} spec: forProvider: - region: {{ .Values.region }} - version: "{{ .Values.version }}" + region: {{ .Values.global.cluster_location }} + version: {{ quote .Values.global.k8s_version }} roleArnSelector: matchLabels: provider: aws @@ -21,11 +21,11 @@ spec: endpointPublicAccess: true subnetIdSelector: matchLabels: - provider: aws - cluster: eks - chart: {{ .Chart.Name }} - type: subnet - access: private + provider: aws + cluster: eks + chart: {{ .Chart.Name }} + type: subnet + access: private writeConnectionSecretToRef: - namespace: {{ .Release.Namespace }} - name: {{ .Chart.Name }} \ No newline at end of file + name: kubeconfig-{{ .Release.Name }} + namespace: managed-resources diff --git a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/node-group.yaml b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/node-group.yaml index 0fe4b3218fef60d257a16feecd33c2e10990a10c..be2935ecf2093c62d713a821014f6afb1182592c 100644 --- a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/node-group.yaml +++ b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/node-group.yaml @@ -1,14 +1,14 @@ apiVersion: eks.aws.crossplane.io/v1alpha1 kind: NodeGroup metadata: - name: {{ .Chart.Name }} + name: nodegroup-{{ .Release.Name }} labels: provider: aws cluster: eks chart: {{ .Chart.Name }} spec: forProvider: - region: {{ .Values.region }} + region: {{ .Values.global.cluster_location }} clusterNameSelector: matchLabels: provider: aws @@ -25,13 +25,13 @@ spec: type: subnet access: private scalingConfig: - minSize: {{ .Values.minSize }} - desiredSize: {{ .Values.minSize }} - maxSize: 4 + # minSize: {{ .Values.global.node_count }} + desiredSize: {{ .Values.global.node_count }} + # maxSize: {{ .Values.global.node_count }} diskSize: 30 instanceTypes: - - {{ .Values.instanceType }} - remoteAccess: - ec2SSHKey: {{ .Values.sshkey }} + - {{ .Values.global.node_size }} + # remoteAccess: + # ec2SSHKey: {{ .Values.sshkey }} tags: Name: {{ .Chart.Name }} \ No newline at end of file diff --git a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/values.yaml b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/values.yaml index 993119a771b82efbc29178a0950f48b93e19ddcd..330ca54baacee29500afd8870ba2466c0b013802 100644 --- a/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/values.yaml +++ b/poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/values.yaml @@ -1,7 +1,3 @@ -version: 1.27 -region: aws_region -instanceType: aws_instance_type -minSize: 1 roles: - name: eks - name: ec2 @@ -40,4 +36,4 @@ zones: routetables: - name: public - name: private -sshkey: key_pair_name \ No newline at end of file +# sshkey: key_pair_name