Skip to content
This repository was archived by the owner on Nov 7, 2019. It is now read-only.

Commit f6c9e0a

Browse files
christopherheinchristopherhein
committed
Adding vendored packages
Signed-off-by: Christopher Hein <[email protected]>
1 parent f0170cf commit f6c9e0a

File tree

7,381 files changed

+259355
-144383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,381 files changed

+259355
-144383
lines changed

‎Gopkg.lock

Lines changed: 234 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,24 @@ required = ["k8s.io/code-generator/cmd/client-gen"]
3636

3737
[[constraint]]
3838
name = "k8s.io/api"
39-
version = "kubernetes-1.10.4"
39+
version = "kubernetes-1.11.3"
4040

4141
[[constraint]]
4242
name = "k8s.io/apiextensions-apiserver"
43-
version = "kubernetes-1.10.4"
43+
version = "kubernetes-1.11.3"
4444

4545
[[constraint]]
4646
name = "k8s.io/apimachinery"
47-
version = "kubernetes-1.10.4"
47+
version = "kubernetes-1.11.3"
4848

4949
[[constraint]]
5050
name = "k8s.io/client-go"
51-
version = "7.0.0"
51+
version = "8.0.0"
5252

5353
[[constraint]]
5454
name = "k8s.io/code-generator"
55-
version = "kubernetes-1.10.4"
55+
version = "kubernetes-1.11.3"
56+
57+
[[override]]
58+
name = "github.com/json-iterator/go"
59+
revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"

‎pkg/operator/dynamodb/controller.go

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import (
1313
"github.com/awslabs/aws-service-operator/pkg/config"
1414
"github.com/awslabs/aws-service-operator/pkg/queue"
1515
opkit "github.com/christopherhein/operator-kit"
16+
"github.com/iancoleman/strcase"
17+
corev1 "k8s.io/api/core/v1"
1618
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1719
"k8s.io/client-go/tools/cache"
20+
"strings"
1821

1922
awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
2023
awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
@@ -96,27 +99,35 @@ func QueueUpdater(config *config.Config, msg *queue.MessageBody) error {
9699
}
97100

98101
if name != "" && namespace != "" {
102+
annotations := map[string]string{
103+
"StackID": msg.ParsedMessage["StackId"],
104+
"StackName": msg.ParsedMessage["StackName"],
105+
"ResourceType": msg.ParsedMessage["ResourceType"],
106+
}
99107
if msg.ParsedMessage["ResourceStatus"] == "ROLLBACK_COMPLETE" {
100-
err := deleteStack(config, name, namespace, msg.ParsedMessage["StackId"])
108+
obj, err := deleteStack(config, name, namespace, msg.ParsedMessage["StackId"])
101109
if err != nil {
102110
return err
103111
}
112+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeWarning, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
104113
} else if msg.ParsedMessage["ResourceStatus"] == "DELETE_COMPLETE" {
105-
err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
114+
obj, err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
106115
if err != nil {
107116
return err
108117
}
109-
118+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeWarning, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
110119
err = incrementRollbackCount(config, name, namespace)
111120
if err != nil {
112121
return err
113122
}
114123
} else {
115-
err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
124+
obj, err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
116125
if err != nil {
117126
return err
118127
}
128+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeNormal, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
119129
}
130+
120131
}
121132

122133
return nil
@@ -134,7 +145,7 @@ func (c *Controller) onAdd(obj interface{}) {
134145
c.config.Logger.Infof("added dynamodb '%s' with stackID '%s'", s.Name, string(*output.StackId))
135146
c.config.Logger.Infof("view at https://console.aws.amazon.com/cloudformation/home?#/stack/detail?stackId=%s", string(*output.StackId))
136147

137-
err = updateStatus(c.config, s.Name, s.Namespace, string(*output.StackId), "CREATE_IN_PROGRESS", "")
148+
_, err = updateStatus(c.config, s.Name, s.Namespace, string(*output.StackId), "CREATE_IN_PROGRESS", "")
138149
if err != nil {
139150
c.config.Logger.WithError(err).Error("error updating status")
140151
}
@@ -158,7 +169,7 @@ func (c *Controller) onUpdate(oldObj, newObj interface{}) {
158169
c.config.Logger.Infof("updated dynamodb '%s' with params '%s'", no.Name, string(*output.StackId))
159170
c.config.Logger.Infof("view at https://console.aws.amazon.com/cloudformation/home?#/stack/detail?stackId=%s", string(*output.StackId))
160171

161-
err = updateStatus(c.config, oo.Name, oo.Namespace, string(*output.StackId), "UPDATE_IN_PROGRESS", "")
172+
_, err = updateStatus(c.config, oo.Name, oo.Namespace, string(*output.StackId), "UPDATE_IN_PROGRESS", "")
162173
if err != nil {
163174
c.config.Logger.WithError(err).Error("error updating status")
164175
}
@@ -196,13 +207,13 @@ func incrementRollbackCount(config *config.Config, name string, namespace string
196207
return nil
197208
}
198209

199-
func updateStatus(config *config.Config, name string, namespace string, stackID string, status string, reason string) error {
210+
func updateStatus(config *config.Config, name string, namespace string, stackID string, status string, reason string) (*awsV1alpha1.DynamoDB, error) {
200211
logger := config.Logger
201212
clientSet, _ := awsclient.NewForConfig(config.RESTConfig)
202213
resource, err := clientSet.DynamoDBs(namespace).Get(name, metav1.GetOptions{})
203214
if err != nil {
204215
logger.WithError(err).Error("error getting dynamodbs")
205-
return err
216+
return nil, err
206217
}
207218

208219
resourceCopy := resource.DeepCopy()
@@ -223,7 +234,7 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
223234
_, err = clientSet.DynamoDBs(namespace).Update(resourceCopy)
224235
if err != nil {
225236
logger.WithError(err).Error("error updating resource")
226-
return err
237+
return nil, err
227238
}
228239

229240
if helpers.IsStackComplete(status, false) {
@@ -232,26 +243,26 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
232243
logger.WithError(err).Info("error syncing resources")
233244
}
234245
}
235-
return nil
246+
return resourceCopy, nil
236247
}
237248

238-
func deleteStack(config *config.Config, name string, namespace string, stackID string) error {
249+
func deleteStack(config *config.Config, name string, namespace string, stackID string) (*awsV1alpha1.DynamoDB, error) {
239250
logger := config.Logger
240251
clientSet, _ := awsclient.NewForConfig(config.RESTConfig)
241252
resource, err := clientSet.DynamoDBs(namespace).Get(name, metav1.GetOptions{})
242253
if err != nil {
243254
logger.WithError(err).Error("error getting dynamodbs")
244-
return err
255+
return nil, err
245256
}
246257

247258
cft := New(config, resource, "")
248259
err = cft.DeleteStack()
249260
if err != nil {
250-
return err
261+
return nil, err
251262
}
252263

253264
err = cft.WaitUntilStackDeleted()
254-
return err
265+
return resource, err
255266
}
256267

257268
func syncAdditionalResources(config *config.Config, s *awsV1alpha1.DynamoDB) (err error) {

‎pkg/operator/ecrrepository/controller.go

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import (
1313
"github.com/awslabs/aws-service-operator/pkg/config"
1414
"github.com/awslabs/aws-service-operator/pkg/queue"
1515
opkit "github.com/christopherhein/operator-kit"
16+
"github.com/iancoleman/strcase"
17+
corev1 "k8s.io/api/core/v1"
1618
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1719
"k8s.io/client-go/tools/cache"
20+
"strings"
1821

1922
awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
2023
awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
@@ -93,27 +96,35 @@ func QueueUpdater(config *config.Config, msg *queue.MessageBody) error {
9396
}
9497

9598
if name != "" && namespace != "" {
99+
annotations := map[string]string{
100+
"StackID": msg.ParsedMessage["StackId"],
101+
"StackName": msg.ParsedMessage["StackName"],
102+
"ResourceType": msg.ParsedMessage["ResourceType"],
103+
}
96104
if msg.ParsedMessage["ResourceStatus"] == "ROLLBACK_COMPLETE" {
97-
err := deleteStack(config, name, namespace, msg.ParsedMessage["StackId"])
105+
obj, err := deleteStack(config, name, namespace, msg.ParsedMessage["StackId"])
98106
if err != nil {
99107
return err
100108
}
109+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeWarning, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
101110
} else if msg.ParsedMessage["ResourceStatus"] == "DELETE_COMPLETE" {
102-
err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
111+
obj, err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
103112
if err != nil {
104113
return err
105114
}
106-
115+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeWarning, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
107116
err = incrementRollbackCount(config, name, namespace)
108117
if err != nil {
109118
return err
110119
}
111120
} else {
112-
err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
121+
obj, err := updateStatus(config, name, namespace, msg.ParsedMessage["StackId"], msg.ParsedMessage["ResourceStatus"], msg.ParsedMessage["ResourceStatusReason"])
113122
if err != nil {
114123
return err
115124
}
125+
config.Recorder.AnnotatedEventf(obj, annotations, corev1.EventTypeNormal, strcase.ToCamel(strings.ToLower(msg.ParsedMessage["ResourceStatus"])), msg.ParsedMessage["ResourceStatusReason"])
116126
}
127+
117128
}
118129

119130
return nil
@@ -131,7 +142,7 @@ func (c *Controller) onAdd(obj interface{}) {
131142
c.config.Logger.Infof("added ecrrepository '%s' with stackID '%s'", s.Name, string(*output.StackId))
132143
c.config.Logger.Infof("view at https://console.aws.amazon.com/cloudformation/home?#/stack/detail?stackId=%s", string(*output.StackId))
133144

134-
err = updateStatus(c.config, s.Name, s.Namespace, string(*output.StackId), "CREATE_IN_PROGRESS", "")
145+
_, err = updateStatus(c.config, s.Name, s.Namespace, string(*output.StackId), "CREATE_IN_PROGRESS", "")
135146
if err != nil {
136147
c.config.Logger.WithError(err).Error("error updating status")
137148
}
@@ -155,7 +166,7 @@ func (c *Controller) onUpdate(oldObj, newObj interface{}) {
155166
c.config.Logger.Infof("updated ecrrepository '%s' with params '%s'", no.Name, string(*output.StackId))
156167
c.config.Logger.Infof("view at https://console.aws.amazon.com/cloudformation/home?#/stack/detail?stackId=%s", string(*output.StackId))
157168

158-
err = updateStatus(c.config, oo.Name, oo.Namespace, string(*output.StackId), "UPDATE_IN_PROGRESS", "")
169+
_, err = updateStatus(c.config, oo.Name, oo.Namespace, string(*output.StackId), "UPDATE_IN_PROGRESS", "")
159170
if err != nil {
160171
c.config.Logger.WithError(err).Error("error updating status")
161172
}
@@ -193,13 +204,13 @@ func incrementRollbackCount(config *config.Config, name string, namespace string
193204
return nil
194205
}
195206

196-
func updateStatus(config *config.Config, name string, namespace string, stackID string, status string, reason string) error {
207+
func updateStatus(config *config.Config, name string, namespace string, stackID string, status string, reason string) (*awsV1alpha1.ECRRepository, error) {
197208
logger := config.Logger
198209
clientSet, _ := awsclient.NewForConfig(config.RESTConfig)
199210
resource, err := clientSet.ECRRepositories(namespace).Get(name, metav1.GetOptions{})
200211
if err != nil {
201212
logger.WithError(err).Error("error getting ecrrepositories")
202-
return err
213+
return nil, err
203214
}
204215

205216
resourceCopy := resource.DeepCopy()
@@ -222,7 +233,7 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
222233
_, err = clientSet.ECRRepositories(namespace).Update(resourceCopy)
223234
if err != nil {
224235
logger.WithError(err).Error("error updating resource")
225-
return err
236+
return nil, err
226237
}
227238

228239
if helpers.IsStackComplete(status, false) {
@@ -231,26 +242,26 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
231242
logger.WithError(err).Info("error syncing resources")
232243
}
233244
}
234-
return nil
245+
return resourceCopy, nil
235246
}
236247

237-
func deleteStack(config *config.Config, name string, namespace string, stackID string) error {
248+
func deleteStack(config *config.Config, name string, namespace string, stackID string) (*awsV1alpha1.ECRRepository, error) {
238249
logger := config.Logger
239250
clientSet, _ := awsclient.NewForConfig(config.RESTConfig)
240251
resource, err := clientSet.ECRRepositories(namespace).Get(name, metav1.GetOptions{})
241252
if err != nil {
242253
logger.WithError(err).Error("error getting ecrrepositories")
243-
return err
254+
return nil, err
244255
}
245256

246257
cft := New(config, resource, "")
247258
err = cft.DeleteStack()
248259
if err != nil {
249-
return err
260+
return nil, err
250261
}
251262

252263
err = cft.WaitUntilStackDeleted()
253-
return err
264+
return resource, err
254265
}
255266

256267
func syncAdditionalResources(config *config.Config, s *awsV1alpha1.ECRRepository) (err error) {

0 commit comments

Comments
 (0)