Commit 42278fc0 authored by mishrau's avatar mishrau
Browse files

Pushing modified helm charts for crossplane AWS tested in AWS env, please review

parent 935a0cb5

poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/eks-cluster.yaml

+1 −1
Original line number Diff line number Diff line
@@ -28,4 +28,4 @@ spec: 
          access: private

  writeConnectionSecretToRef:

    name: kubeconfig-{{ .Release.Name }}

    namespace: managed-resources
 
    namespace: crossplane-system

poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/eks-cluster/node-group.yaml

+2 −3
Original line number Diff line number Diff line 
---

apiVersion: eks.aws.crossplane.io/v1alpha1

kind: NodeGroup

metadata:

  name: nodegroup-{{ .Release.Name }}

  name: nodegroup-{{ .Release.Name }}-{{ .Values.global.resource_group }}

  labels:

    provider: aws

    cluster: eks
@@ -31,7 +32,5 @@ spec: 
    diskSize: 30

    instanceTypes:

      - {{ .Values.global.node_size }}

    # remoteAccess: 

    #   ec2SSHKey: {{ .Values.sshkey }}

    tags:

      Name: {{ .Chart.Name }}
 
 No newline at end of file

poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/network/gateways.yaml

+10 −11
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
apiVersion: ec2.aws.crossplane.io/v1beta1

kind: InternetGateway

metadata:

  name: {{ .Chart.Name }}

  name: {{ .Release.Name }}-igw

  labels:

    provider: aws

    cluster: eks
@@ -10,7 +10,7 @@ metadata: 
    type: igw

spec:

  forProvider:

    region: {{ .Values.region }}

    region: {{ .Values.global.cluster_location }}

    vpcIdSelector:

      matchLabels:

        provider: aws
@@ -18,14 +18,13 @@ spec: 
        chart: {{ .Chart.Name }}

    tags:

      - key: Name

        value: "crossplane-igw"

        value: {{ .Release.Name }}-igw



---



apiVersion: ec2.aws.crossplane.io/v1beta1

kind: Address

metadata:

  name: {{ .Chart.Name }}

  name: {{ .Release.Name }}-eip

  labels:

    provider: aws

    cluster: eks
@@ -33,17 +32,17 @@ metadata: 
    type: eip

spec:

  forProvider:

    region: {{ .Values.region }}

    region: {{ .Values.global.cluster_location }}

    domain: vpc

    tags:

    - key: Name

      value: crossplane-eip

      value: {{ .Release.Name }}-eip



---

apiVersion: ec2.aws.crossplane.io/v1beta1

kind: NATGateway

metadata:

  name: {{ .Chart.Name }}

  name: {{ .Release.Name }}-natgw

  labels:

    provider: aws

    cluster: eks
@@ -51,7 +50,7 @@ metadata: 
    type: natgw

spec:

  forProvider:

    region: {{ .Values.region }}

    region: {{ .Values.global.cluster_location }}

    connectivityType: public

    allocationIdSelector:

        matchLabels:
@@ -65,8 +64,8 @@ spec: 
        provider: aws

        cluster: eks

        chart: {{ $root.Chart.Name }}

        zone: {{ $root.Values.region }}a

        zone: {{ $root.Values.global.cluster_location }}a

        access: public

    tags:

    - key: Name

      value: nat-gateway
 
 No newline at end of file
 
      value: {{ .Release.Name }}-natgw
 
 No newline at end of file

poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/network/route-tables.yaml

+4 −4
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ 
apiVersion: ec2.aws.crossplane.io/v1beta1

kind: RouteTable

metadata:

  name: {{ .name }}-route-table

  name: {{ $root.Release.Name }}-{{ .name }}-route-table

  labels:

    provider: aws

    cluster: eks

    chart: {{ $root.Chart.Name }}

spec:

  forProvider:

    region: "ap-south-1"

    region: {{ $root.Values.global.cluster_location }}

    vpcIdSelector:

      matchLabels:

        provider: aws
@@ -44,11 +44,11 @@ spec: 
            chart: {{ $root.Chart.Name }}

            type: subnet

            access: {{ $zone.access }}

            zone: {{ $root.Values.region }}{{ $zone.zone }}

            zone: {{ $root.Values.global.cluster_location }}{{ $zone.zone }}

      {{- end }}

      {{- end }}

    tags:

      - key: Name

        value: "crossplane-{{ .name }}route-table"

        value: "{{ $root.Release.Name }}-{{ .name }}-route-table"

---

{{- end }}

poc-osm-ltv/cluster_knf/helm-chart-v3s/supercluster/charts/crossplane-aws/templates/network/subnet.yaml

+5 −5
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ 
apiVersion: ec2.aws.crossplane.io/v1beta1

kind: Subnet

metadata:

  name: {{ $root.Chart.Name }}-{{ .access }}-subnet-{{ $root.Values.region }}{{ .zone }}

  name: {{ $root.Release.Name }}-{{ .access }}-subnet-{{ $root.Values.global.cluster_location }}{{ .zone }}

  labels:

    type: subnet

    provider: aws

    cluster: eks

    chart: {{ $root.Chart.Name }}

    zone: {{ $root.Values.region }}{{ .zone }}

    zone: {{ $root.Values.global.cluster_location }}{{ .zone }}

    access: {{ .access }}

spec:

  forProvider:

    region: {{ $root.Values.region }}

    availabilityZone: {{ $root.Values.region }}{{ .zone }}

    region: {{ $root.Values.global.cluster_location }}

    availabilityZone: {{ $root.Values.global.cluster_location }}{{ .zone }}

    cidrBlock: {{ .cidr }}

    vpcIdSelector:

      matchLabels:
@@ -27,7 +27,7 @@ spec: 
    - key: kubernetes.io/role/elb

      value: "1"

    - key: Name

      value: "crossplane-{{ .access }}-subnet-{{ $root.Values.region }}{{ .zone }}"

      value: "{{ $root.Release.Name }}-{{ .access }}-subnet-{{ $root.Values.global.cluster_location }}{{ .zone }}"

    {{- if eq .access "private" }}

    - key: "kubernetes.io/cluster/{{ $root.Chart.Name }}"

      value: "shared"