kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cloudformation verify

This commit is contained in:
Jason Haugen 2021-03-25 12:25:42 -05:00
parent 318a116ba6
commit fb3f317e42
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/integration/update_cluster/nodeterminationhandler_sqs_resources/cloudformation.json
View File

@ -916,7 +916,14 @@
"Type": "AWS::Events::Rule", "Type": "AWS::Events::Rule",
"Properties": { "Properties": {
"Name": "queueprocessor.example.com-ASGLifecycle", "Name": "queueprocessor.example.com-ASGLifecycle",
"EventPattern": "{"source":["aws.autoscaling"],"detail-type":["EC2 Instance-terminate Lifecycle Action"]}", "EventPattern": {
"detail-type": [
"EC2 Instance-terminate Lifecycle Action"
],
"source": [
"aws.autoscaling"
]
},
"Targets": [ "Targets": [
{ {
"Id": "1", "Id": "1",
@ -929,7 +936,14 @@
"Type": "AWS::Events::Rule", "Type": "AWS::Events::Rule",
"Properties": { "Properties": {
"Name": "queueprocessor.example.com-RebalanceRecommendation", "Name": "queueprocessor.example.com-RebalanceRecommendation",
"EventPattern": "{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}", "EventPattern": {
"detail-type": [
"EC2 Instance Rebalance Recommendation"
],
"source": [
"aws.ec2"
]
},
"Targets": [ "Targets": [
{ {
"Id": "1", "Id": "1",
@ -942,7 +956,14 @@
"Type": "AWS::Events::Rule", "Type": "AWS::Events::Rule",
"Properties": { "Properties": {
"Name": "queueprocessor.example.com-SpotInterruption", "Name": "queueprocessor.example.com-SpotInterruption",
"EventPattern": "{"source": ["aws.ec2"],"detail-type": ["EC2 Spot Instance Interruption Warning"]}", "EventPattern": {
"detail-type": [
"EC2 Spot Instance Interruption Warning"
],
"source": [
"aws.ec2"
]
},
"Targets": [ "Targets": [
{ {
"Id": "1", "Id": "1",

19
upup/pkg/fi/cloudup/awstasks/eventbridgerule.go
View File

@ -17,12 +17,12 @@ limitations under the License.
package awstasks package awstasks
import ( import (
"encoding/json"
"fmt" "fmt"
"k8s.io/apimachinery/pkg/util/validation/field"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/eventbridge" "github.com/aws/aws-sdk-go/service/eventbridge"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
@ -149,11 +149,22 @@ type cloudformationTarget struct {
type cloudformationEventBridgeRule struct { type cloudformationEventBridgeRule struct {
Name *string `json:"Name"` Name *string `json:"Name"`
EventPattern *string `json:"EventPattern"` EventPattern map[string]interface{} `json:"EventPattern"`
Targets []cloudformationTarget `json:"Targets"` Targets []cloudformationTarget `json:"Targets"`
} }
func (_ *EventBridgeRule) RenderCloudformation(t *cloudformation.CloudformationTarget, a, e, changes *EventBridgeRule) error { func (_ *EventBridgeRule) RenderCloudformation(t *cloudformation.CloudformationTarget, a, e, changes *EventBridgeRule) error {
// convert event pattern string into a json struct
jsonString, err := fi.ResourceAsBytes(fi.NewStringResource(*e.EventPattern))
if err != nil {
return err
}
data := make(map[string]interface{})
err = json.Unmarshal(jsonString, &data)
if err != nil {
return fmt.Errorf("error parsing SQS PolicyDocument: %v", err)
}
target := &cloudformationTarget{ target := &cloudformationTarget{
Id: s("1"), Id: s("1"),
Arn: e.TargetArn, Arn: e.TargetArn,
@ -161,7 +172,7 @@ func (_ *EventBridgeRule) RenderCloudformation(t *cloudformation.CloudformationT
cf := &cloudformationEventBridgeRule{ cf := &cloudformationEventBridgeRule{
Name: e.Name, Name: e.Name,
EventPattern: e.EventPattern, EventPattern: data,
Targets: []cloudformationTarget{*target}, Targets: []cloudformationTarget{*target},
} }