From 9829e79d7c0a632188407e5c7f16178135b13764 Mon Sep 17 00:00:00 2001 From: nimrodgab Date: Wed, 14 Feb 2024 10:34:42 +0200 Subject: [PATCH] Updated cluster templates outputs --- aws/templates/cluster/cluster-master.yaml | 22 +++++++++++++++++++ aws/templates/cluster/cluster.yaml | 22 +++++++++++++++++++ .../cross-az-cluster-master.yaml | 22 +++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/aws/templates/cluster/cluster-master.yaml b/aws/templates/cluster/cluster-master.yaml index 5a6ac254..0f73a08c 100755 --- a/aws/templates/cluster/cluster-master.yaml +++ b/aws/templates/cluster/cluster-master.yaml @@ -456,6 +456,16 @@ Outputs: Condition: AllocateAddress Description: URL to the member A portal. Value: !GetAtt ClusterStack.Outputs.MemberAURL + MemberAExternalInterface: + Condition: AllocateAddress + Description: The external interface of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAExternalInterface + MemberAPrivateExternalAddress: + Description: The private external address of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAPrivateExternalAddress + MemberAPrivateInternalAddress: + Description: The private internal address of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAPrivateInternalAddress MemberBPublicAddress: Condition: AllocateAddress Description: The public address of member B. @@ -468,6 +478,18 @@ Outputs: Condition: AllocateAddress Description: URL to the member B portal. Value: !GetAtt ClusterStack.Outputs.MemberBURL + MemberBPrivateExternalAddress: + Description: The private external address of member B. + Value: !GetAtt ClusterStack.Outputs.MemberBPrivateExternalAddress + MemberBPrivateInternalAddress: + Description: The private internal address of member B. + Value: !GetAtt ClusterStack.Outputs.MemberBPrivateInternalAddress + ClusterPrivateAliasExternalAddress: + Description: The secondary external private IP address of the cluster. + Value: !GetAtt ClusterStack.Outputs.ClusterPrivateAliasExternalAddress + ClusterPrivateAliasInternalAddress: + Description: The secondary internal private IP address of the cluster. + Value: !GetAtt ClusterStack.Outputs.ClusterPrivateAliasInternalAddress Rules: MemberATokenNotProvided: RuleCondition: !Equals [!Ref MemberAToken, ''] diff --git a/aws/templates/cluster/cluster.yaml b/aws/templates/cluster/cluster.yaml index 1418885b..ca4acbfd 100755 --- a/aws/templates/cluster/cluster.yaml +++ b/aws/templates/cluster/cluster.yaml @@ -656,6 +656,16 @@ Outputs: Condition: AllocateAddress Description: URL to the member A portal. Value: !Join ['', ['https://', !Ref MemberAPublicAddress]] + MemberAExternalInterface: + Condition: AllocateAddress + Description: The external interface of member A. + Value: !Ref MemberAExternalInterface + MemberAPrivateExternalAddress: + Description: The private external address of member A. + Value: !GetAtt MemberAExternalInterface.PrimaryPrivateIpAddress + MemberAPrivateInternalAddress: + Description: The private internal address of member A. + Value: !GetAtt MemberAInternalInterface.PrimaryPrivateIpAddress MemberBPublicAddress: Condition: AllocateAddress Description: The public address of member B. @@ -668,6 +678,18 @@ Outputs: Condition: AllocateAddress Description: URL to the member B portal. Value: !Join ['', ['https://', !Ref MemberBPublicAddress]] + MemberBPrivateExternalAddress: + Description: The private external address of member B. + Value: !GetAtt MemberBExternalInterface.PrimaryPrivateIpAddress + MemberBPrivateInternalAddress: + Description: The private internal address of member B. + Value: !GetAtt MemberBInternalInterface.PrimaryPrivateIpAddress + ClusterPrivateAliasExternalAddress: + Description: The secondary external private IP address of the cluster. + Value: !Select [ 0, !GetAtt MemberAExternalInterface.SecondaryPrivateIpAddresses ] + ClusterPrivateAliasInternalAddress: + Description: The secondary internal private IP address of the cluster. + Value: !Select [ 0, !GetAtt MemberAInternalInterface.SecondaryPrivateIpAddresses ] Rules: MemberATokenNotProvided: diff --git a/aws/templates/cross-az-cluster/cross-az-cluster-master.yaml b/aws/templates/cross-az-cluster/cross-az-cluster-master.yaml index 75cd5981..65ed15aa 100755 --- a/aws/templates/cross-az-cluster/cross-az-cluster-master.yaml +++ b/aws/templates/cross-az-cluster/cross-az-cluster-master.yaml @@ -459,6 +459,19 @@ Outputs: Condition: AllocateAddress Description: URL to the member A portal. Value: !GetAtt ClusterStack.Outputs.MemberAURL + MemberAExternalInterface: + Condition: AllocateAddress + Description: The external interface of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAExternalInterface + MemberAPrivateExternalAddress: + Description: The primary external private address of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAPrivateExternalAddress + MemberAPrivateAliasAddress: + Description: The secondary external private IP address of Member A. + Value: !GetAtt ClusterStack.Outputs.MemberAPrivateAliasAddress + MemberAPrivateInternalAddress: + Description: The private Internal address of member A. + Value: !GetAtt ClusterStack.Outputs.MemberAPrivateInternalAddress MemberBPublicAddress: Condition: AllocateAddress Description: The public address of member B. @@ -471,6 +484,15 @@ Outputs: Condition: AllocateAddress Description: URL to the member B portal. Value: !GetAtt ClusterStack.Outputs.MemberBURL + MemberBPrivateExternalAddress: + Description: The primary external private address of member B. + Value: !GetAtt ClusterStack.Outputs.MemberBPrivateExternalAddress + MemberBPrivateAliasAddress: + Description: The secondary external private IP address of Member B. + Value: !GetAtt ClusterStack.Outputs.MemberBPrivateAliasAddress + MemberBPrivateInternalAddress: + Description: The private Internal address of member B. + Value: !GetAtt ClusterStack.Outputs.MemberBPrivateInternalAddress Rules: MemberATokenNotProvided: RuleCondition: !Equals [!Ref MemberAToken, '']