Skip to content

Commit ada0ff0

Browse files
ContentfulCormacContentfulCormac
committed
[MEC-1468] - update deps
1 parent 6c96b39 commit ada0ff0

File tree

5 files changed

+70
-17
lines changed

5 files changed

+70
-17
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ 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,
5252
},
@@ -112,7 +112,7 @@ var _ = Describe("SyncedSecret Controller", func() {
112112
ResourceVersion: resourceVersion,
113113
},
114114
Spec: secretsv1.SyncedSecretSpec{
115-
SecretMetadata: metav1.ObjectMeta{
115+
SecretMetadata: secretsv1.SecretMetadata{
116116
Name: secretKey.Name,
117117
Namespace: secretKey.Namespace,
118118
},
@@ -238,7 +238,7 @@ var _ = Describe("SyncedSecret Controller", func() {
238238
ResourceVersion: resourceVersion,
239239
},
240240
Spec: secretsv1.SyncedSecretSpec{
241-
SecretMetadata: metav1.ObjectMeta{
241+
SecretMetadata: secretsv1.SecretMetadata{
242242
Name: secretKey.Name,
243243
Namespace: secretKey.Namespace,
244244
},
@@ -309,7 +309,7 @@ var _ = Describe("SyncedSecret Controller", func() {
309309
ResourceVersion: resourceVersion,
310310
},
311311
Spec: secretsv1.SyncedSecretSpec{
312-
SecretMetadata: metav1.ObjectMeta{
312+
SecretMetadata: secretsv1.SecretMetadata{
313313
Name: secretKey.Name,
314314
Namespace: secretKey.Namespace,
315315
},
@@ -436,7 +436,7 @@ var _ = Describe("SyncedSecret Controller", func() {
436436
ResourceVersion: resourceVersion,
437437
},
438438
Spec: secretsv1.SyncedSecretSpec{
439-
SecretMetadata: metav1.ObjectMeta{
439+
SecretMetadata: secretsv1.SecretMetadata{
440440
Name: secretKey.Name,
441441
Namespace: secretKey.Namespace,
442442
},
@@ -493,7 +493,7 @@ var _ = Describe("SyncedSecret Controller", func() {
493493
ResourceVersion: resourceVersion,
494494
},
495495
Spec: secretsv1.SyncedSecretSpec{
496-
SecretMetadata: metav1.ObjectMeta{
496+
SecretMetadata: secretsv1.SecretMetadata{
497497
Name: secretKey.Name,
498498
Namespace: secretKey.Namespace,
499499
},

‎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)