Skip to content

Commit cf33349

Browse files
ContentfulCormacContentfulCormac
authored
Merge pull request #160 from contentful-labs/test-upgrade-deps
chore: [] Manually update types
2 parents 459839d + d435aed commit cf33349

File tree

7 files changed

+100
-29
lines changed

7 files changed

+100
-29
lines changed

‎api/v1/syncedsecret_types.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,21 @@ type SecretField struct {
6161
ValueFrom *ValueFrom `json:"valueFrom,omitempty"`
6262
}
6363

64+
type SecretMetadata struct {
65+
Name string `json:"name,omitempty"`
66+
Namespace string `json:"namespace,omitempty"`
67+
Labels map[string]string `json:"labels,omitempty"`
68+
Annotations map[string]string `json:"annotations,omitempty"`
69+
CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
70+
}
71+
6472
// SyncedSecretSpec defines the desired state of SyncedSecret
6573
type SyncedSecretSpec struct {
6674
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
6775
// Important: Run "make" to regenerate code after modifying this file
6876

6977
// Secret Metadata
70-
SecretMetadata metav1.ObjectMeta `json:"secretMetadata,omitempty"`
71-
78+
SecretMetadata SecretMetadata `json:"secretMetadata,omitempty"`
7279
// IAMRole
7380
// +optional
7481
IAMRole *string `json:"IAMRole"`

‎api/v1/zz_generated.deepcopy.go

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

‎config/crd/bases/secrets.contentful.com_syncedsecrets.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,22 @@ spec:
9797
type: object
9898
secretMetadata:
9999
description: Secret Metadata
100+
properties:
101+
annotations:
102+
additionalProperties:
103+
type: string
104+
type: object
105+
creationTimestamp:
106+
format: date-time
107+
type: string
108+
labels:
109+
additionalProperties:
110+
type: string
111+
type: object
112+
name:
113+
type: string
114+
namespace:
115+
type: string
100116
type: object
101117
type: object
102118
status:

‎controllers/syncedsecret_controller_test.go

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,12 @@ var _ = Describe("SyncedSecret Controller", func() {
4646
ResourceVersion: resourceVersion,
4747
},
4848
Spec: secretsv1.SyncedSecretSpec{
49-
SecretMetadata: metav1.ObjectMeta{
49+
SecretMetadata: secretsv1.SecretMetadata{
5050
Name: secretKey.Name,
5151
Namespace: secretKey.Namespace,
52+
CreationTimestamp: metav1.Time{
53+
Time: time_now,
54+
},
5255
},
5356
IAMRole: _s("test"),
5457
Data: []*secretsv1.SecretField{
@@ -112,9 +115,12 @@ var _ = Describe("SyncedSecret Controller", func() {
112115
ResourceVersion: resourceVersion,
113116
},
114117
Spec: secretsv1.SyncedSecretSpec{
115-
SecretMetadata: metav1.ObjectMeta{
118+
SecretMetadata: secretsv1.SecretMetadata{
116119
Name: secretKey.Name,
117120
Namespace: secretKey.Namespace,
121+
CreationTimestamp: metav1.Time{
122+
Time: time_now,
123+
},
118124
},
119125
IAMRole: _s("test"),
120126
Data: []*secretsv1.SecretField{
@@ -238,9 +244,12 @@ var _ = Describe("SyncedSecret Controller", func() {
238244
ResourceVersion: resourceVersion,
239245
},
240246
Spec: secretsv1.SyncedSecretSpec{
241-
SecretMetadata: metav1.ObjectMeta{
247+
SecretMetadata: secretsv1.SecretMetadata{
242248
Name: secretKey.Name,
243249
Namespace: secretKey.Namespace,
250+
CreationTimestamp: metav1.Time{
251+
Time: time_now,
252+
},
244253
},
245254
AWSAccountID: _s("12345678910"),
246255
IAMRole: _s("test"),
@@ -309,9 +318,12 @@ var _ = Describe("SyncedSecret Controller", func() {
309318
ResourceVersion: resourceVersion,
310319
},
311320
Spec: secretsv1.SyncedSecretSpec{
312-
SecretMetadata: metav1.ObjectMeta{
321+
SecretMetadata: secretsv1.SecretMetadata{
313322
Name: secretKey.Name,
314323
Namespace: secretKey.Namespace,
324+
CreationTimestamp: metav1.Time{
325+
Time: time_now,
326+
},
315327
},
316328
IAMRole: _s("test"),
317329
AWSAccountID: _s("12345678910"),
@@ -436,9 +448,12 @@ var _ = Describe("SyncedSecret Controller", func() {
436448
ResourceVersion: resourceVersion,
437449
},
438450
Spec: secretsv1.SyncedSecretSpec{
439-
SecretMetadata: metav1.ObjectMeta{
451+
SecretMetadata: secretsv1.SecretMetadata{
440452
Name: secretKey.Name,
441453
Namespace: secretKey.Namespace,
454+
CreationTimestamp: metav1.Time{
455+
Time: time_now,
456+
},
442457
},
443458
AWSAccountID: _s("12345678910"),
444459
IAMRole: _s("test"),
@@ -493,9 +508,12 @@ var _ = Describe("SyncedSecret Controller", func() {
493508
ResourceVersion: resourceVersion,
494509
},
495510
Spec: secretsv1.SyncedSecretSpec{
496-
SecretMetadata: metav1.ObjectMeta{
511+
SecretMetadata: secretsv1.SecretMetadata{
497512
Name: secretKey.Name,
498513
Namespace: secretKey.Namespace,
514+
CreationTimestamp: metav1.Time{
515+
Time: time_now,
516+
},
499517
},
500518
IAMRole: _s("test"),
501519
AWSAccountID: _s("12345678910"),

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
go.uber.org/zap v1.27.0
1717
k8s.io/api v0.32.1
1818
k8s.io/apimachinery v0.32.1
19-
k8s.io/client-go v0.32.0
20-
sigs.k8s.io/controller-runtime v0.20.1
19+
k8s.io/client-go v0.32.1
20+
sigs.k8s.io/controller-runtime v0.20.2
2121
)
2222

2323
require (
@@ -27,7 +27,7 @@ require (
2727
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2828
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2929
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
30-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
30+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3131
github.com/fsnotify/fsnotify v1.7.0 // indirect
3232
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3333
github.com/go-logr/zapr v1.3.0 // indirect
@@ -75,7 +75,7 @@ require (
7575
gopkg.in/inf.v0 v0.9.1 // indirect
7676
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
78+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
7979
k8s.io/klog/v2 v2.130.1 // indirect
8080
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
8181
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER
1919
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
2020
github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k=
2121
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
22-
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
23-
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
22+
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
23+
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
2424
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
2525
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
2626
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -246,20 +246,20 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
246246
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
247247
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
248248
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
249-
k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0=
250-
k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw=
249+
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
250+
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
251251
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
252252
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
253-
k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
254-
k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
253+
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
254+
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
255255
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
256256
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
257257
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
258258
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
259259
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
260260
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
261-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
262-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
261+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
262+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
263263
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
264264
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
265265
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎pkg/k8ssecret/secret_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestGenerateSecret(t *testing.T) {
7777
Namespace: "secret-namespace",
7878
},
7979
Spec: secretsv1.SyncedSecretSpec{
80-
SecretMetadata: metav1.ObjectMeta{
80+
SecretMetadata: secretsv1.SecretMetadata{
8181
Name: "secret-name",
8282
Namespace: "secret-namespace",
8383
Annotations: map[string]string{
@@ -120,7 +120,7 @@ func TestGenerateSecret(t *testing.T) {
120120
Namespace: "secret-namespace",
121121
},
122122
Spec: secretsv1.SyncedSecretSpec{
123-
SecretMetadata: metav1.ObjectMeta{
123+
SecretMetadata: secretsv1.SecretMetadata{
124124
Name: "secret-name",
125125
Namespace: "secret-namespace",
126126
Annotations: map[string]string{
@@ -172,7 +172,7 @@ func TestGenerateSecret(t *testing.T) {
172172
Namespace: "secret-namespace",
173173
},
174174
Spec: secretsv1.SyncedSecretSpec{
175-
SecretMetadata: metav1.ObjectMeta{
175+
SecretMetadata: secretsv1.SecretMetadata{
176176
Name: "secret-name",
177177
Namespace: "secret-namespace",
178178
Annotations: map[string]string{
@@ -224,7 +224,7 @@ func TestGenerateSecret(t *testing.T) {
224224
Namespace: "secret-namespace",
225225
},
226226
Spec: secretsv1.SyncedSecretSpec{
227-
SecretMetadata: metav1.ObjectMeta{
227+
SecretMetadata: secretsv1.SecretMetadata{
228228
Name: "secret-name",
229229
Namespace: "secret-namespace",
230230
Annotations: map[string]string{
@@ -260,7 +260,7 @@ func TestGenerateSecret(t *testing.T) {
260260
Namespace: "secret-namespace",
261261
},
262262
Spec: secretsv1.SyncedSecretSpec{
263-
SecretMetadata: metav1.ObjectMeta{
263+
SecretMetadata: secretsv1.SecretMetadata{
264264
Name: "secret-name",
265265
Namespace: "secret-namespace",
266266
Annotations: map[string]string{
@@ -312,7 +312,7 @@ func TestGenerateSecret(t *testing.T) {
312312
Namespace: "secret-namespace",
313313
},
314314
Spec: secretsv1.SyncedSecretSpec{
315-
SecretMetadata: metav1.ObjectMeta{
315+
SecretMetadata: secretsv1.SecretMetadata{
316316
Name: "secret-name",
317317
Namespace: "secret-namespace",
318318
Annotations: map[string]string{
@@ -364,7 +364,7 @@ func TestGenerateSecret(t *testing.T) {
364364
Namespace: "secret-namespace",
365365
},
366366
Spec: secretsv1.SyncedSecretSpec{
367-
SecretMetadata: metav1.ObjectMeta{
367+
SecretMetadata: secretsv1.SecretMetadata{
368368
Name: "secret-name",
369369
Namespace: "secret-namespace",
370370
Annotations: map[string]string{
@@ -413,7 +413,7 @@ func TestGenerateSecret(t *testing.T) {
413413
Namespace: "secret-namespace",
414414
},
415415
Spec: secretsv1.SyncedSecretSpec{
416-
SecretMetadata: metav1.ObjectMeta{
416+
SecretMetadata: secretsv1.SecretMetadata{
417417
Name: "secret-name",
418418
Namespace: "secret-namespace",
419419
Annotations: map[string]string{
@@ -446,7 +446,7 @@ func TestGenerateSecret(t *testing.T) {
446446
Namespace: "secret-namespace",
447447
},
448448
Spec: secretsv1.SyncedSecretSpec{
449-
SecretMetadata: metav1.ObjectMeta{
449+
SecretMetadata: secretsv1.SecretMetadata{
450450
Name: "secret-name",
451451
Namespace: "secret-namespace",
452452
Annotations: map[string]string{

0 commit comments

Comments
 (0)