Merge pull request #2528 from oliviassss/update-certificates

remove undesired certificates before adding new ones

Author: k8s-ci-robot

pkg/deploy/elbv2/listener_manager.go

@@ -176,48 +176,48 @@ func (m *defaultListenerManager) updateSDKListenerWithExtraCertificates(ctx cont
 		currentExtraCertARNs.Insert(certARNs...)
 	}
 
-	for _, certARN := range desiredExtraCertARNs.Difference(currentExtraCertARNs).List() {
-		req := &elbv2sdk.AddListenerCertificatesInput{
+	for _, certARN := range currentExtraCertARNs.Difference(desiredExtraCertARNs).List() {
+		req := &elbv2sdk.RemoveListenerCertificatesInput{
 			ListenerArn: sdkLS.Listener.ListenerArn,
 			Certificates: []*elbv2sdk.Certificate{
 				{
 					CertificateArn: awssdk.String(certARN),
 				},
 			},
 		}
-		m.logger.Info("adding certificate to listener",
+		m.logger.Info("removing certificate from listener",
 			"stackID", resLS.Stack().StackID(),
 			"resourceID", resLS.ID(),
 			"arn", awssdk.StringValue(sdkLS.Listener.ListenerArn),
 			"certificateARN", certARN)
-		if _, err := m.elbv2Client.AddListenerCertificatesWithContext(ctx, req); err != nil {
+		if _, err := m.elbv2Client.RemoveListenerCertificatesWithContext(ctx, req); err != nil {
 			return err
 		}
-		m.logger.Info("added certificate to listener",
+		m.logger.Info("removed certificate from listener",
 			"stackID", resLS.Stack().StackID(),
 			"resourceID", resLS.ID(),
 			"arn", awssdk.StringValue(sdkLS.Listener.ListenerArn),
 			"certificateARN", certARN)
 	}
 
-	for _, certARN := range currentExtraCertARNs.Difference(desiredExtraCertARNs).List() {
-		req := &elbv2sdk.RemoveListenerCertificatesInput{
+	for _, certARN := range desiredExtraCertARNs.Difference(currentExtraCertARNs).List() {
+		req := &elbv2sdk.AddListenerCertificatesInput{
 			ListenerArn: sdkLS.Listener.ListenerArn,
 			Certificates: []*elbv2sdk.Certificate{
 				{
 					CertificateArn: awssdk.String(certARN),
 				},
 			},
 		}
-		m.logger.Info("removing certificate from listener",
+		m.logger.Info("adding certificate to listener",
 			"stackID", resLS.Stack().StackID(),
 			"resourceID", resLS.ID(),
 			"arn", awssdk.StringValue(sdkLS.Listener.ListenerArn),
 			"certificateARN", certARN)
-		if _, err := m.elbv2Client.RemoveListenerCertificatesWithContext(ctx, req); err != nil {
+		if _, err := m.elbv2Client.AddListenerCertificatesWithContext(ctx, req); err != nil {
 			return err
 		}
-		m.logger.Info("removed certificate from listener",
+		m.logger.Info("added certificate to listener",
 			"stackID", resLS.Stack().StackID(),
 			"resourceID", resLS.ID(),
 			"arn", awssdk.StringValue(sdkLS.Listener.ListenerArn),