Skip to content

Commit 1f46715

Browse files
Deydra71Deydra71
committed
testing
Signed-off-by: Veronika Fisarova <[email protected]>
1 parent 1409bf2 commit 1f46715

File tree

7 files changed

+136
-125
lines changed

7 files changed

+136
-125
lines changed

‎api/bases/telemetry.openstack.org_autoscalings.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,36 @@ spec:
294294
description: ServiceUser - optional username used for this service
295295
to register in keystone
296296
type: string
297+
tls:
298+
description: TLS - Parameters related to the TLS
299+
properties:
300+
api:
301+
description: API tls type which encapsulates for API services
302+
properties:
303+
internal:
304+
description: Internal GenericService - holds the secret
305+
for the internal endpoint
306+
properties:
307+
secretName:
308+
description: SecretName - holding the cert, key for
309+
the service
310+
type: string
311+
type: object
312+
public:
313+
description: Public GenericService - holds the secret
314+
for the public endpoint
315+
properties:
316+
secretName:
317+
description: SecretName - holding the cert, key for
318+
the service
319+
type: string
320+
type: object
321+
type: object
322+
caBundleSecretName:
323+
description: CaBundleSecretName - holding the CA certs in
324+
a pre-created bundle file
325+
type: string
326+
type: object
297327
required:
298328
- apiImage
299329
- databaseInstance
@@ -316,36 +346,6 @@ spec:
316346
maximum: 65535
317347
minimum: 1
318348
type: integer
319-
tls:
320-
description: TLS - Parameters related to the TLS
321-
properties:
322-
api:
323-
description: API tls type which encapsulates for API services
324-
properties:
325-
internal:
326-
description: Internal GenericService - holds the secret for
327-
the internal endpoint
328-
properties:
329-
secretName:
330-
description: SecretName - holding the cert, key for the
331-
service
332-
type: string
333-
type: object
334-
public:
335-
description: Public GenericService - holds the secret for
336-
the public endpoint
337-
properties:
338-
secretName:
339-
description: SecretName - holding the cert, key for the
340-
service
341-
type: string
342-
type: object
343-
type: object
344-
caBundleSecretName:
345-
description: CaBundleSecretName - holding the CA certs in a pre-created
346-
bundle file
347-
type: string
348-
type: object
349349
required:
350350
- heatInstance
351351
type: object

‎api/bases/telemetry.openstack.org_telemetries.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,36 @@ spec:
308308
description: ServiceUser - optional username used for this
309309
service to register in keystone
310310
type: string
311+
tls:
312+
description: TLS - Parameters related to the TLS
313+
properties:
314+
api:
315+
description: API tls type which encapsulates for API services
316+
properties:
317+
internal:
318+
description: Internal GenericService - holds the secret
319+
for the internal endpoint
320+
properties:
321+
secretName:
322+
description: SecretName - holding the cert, key
323+
for the service
324+
type: string
325+
type: object
326+
public:
327+
description: Public GenericService - holds the secret
328+
for the public endpoint
329+
properties:
330+
secretName:
331+
description: SecretName - holding the cert, key
332+
for the service
333+
type: string
334+
type: object
335+
type: object
336+
caBundleSecretName:
337+
description: CaBundleSecretName - holding the CA certs
338+
in a pre-created bundle file
339+
type: string
340+
type: object
311341
required:
312342
- apiImage
313343
- databaseInstance
@@ -335,36 +365,6 @@ spec:
335365
maximum: 65535
336366
minimum: 1
337367
type: integer
338-
tls:
339-
description: TLS - Parameters related to the TLS
340-
properties:
341-
api:
342-
description: API tls type which encapsulates for API services
343-
properties:
344-
internal:
345-
description: Internal GenericService - holds the secret
346-
for the internal endpoint
347-
properties:
348-
secretName:
349-
description: SecretName - holding the cert, key for
350-
the service
351-
type: string
352-
type: object
353-
public:
354-
description: Public GenericService - holds the secret
355-
for the public endpoint
356-
properties:
357-
secretName:
358-
description: SecretName - holding the cert, key for
359-
the service
360-
type: string
361-
type: object
362-
type: object
363-
caBundleSecretName:
364-
description: CaBundleSecretName - holding the CA certs in
365-
a pre-created bundle file
366-
type: string
367-
type: object
368368
required:
369369
- heatInstance
370370
type: object

‎api/go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/openstack-k8s-operators/telemetry-operator/api
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.1
46

57
require (
68
github.com/onsi/ginkgo/v2 v2.14.0
@@ -73,4 +75,4 @@ require (
7375
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7476
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7577
sigs.k8s.io/yaml v1.4.0 // indirect
76-
)
78+
)

‎config/crd/bases/telemetry.openstack.org_autoscalings.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,36 @@ spec:
294294
description: ServiceUser - optional username used for this service
295295
to register in keystone
296296
type: string
297+
tls:
298+
description: TLS - Parameters related to the TLS
299+
properties:
300+
api:
301+
description: API tls type which encapsulates for API services
302+
properties:
303+
internal:
304+
description: Internal GenericService - holds the secret
305+
for the internal endpoint
306+
properties:
307+
secretName:
308+
description: SecretName - holding the cert, key for
309+
the service
310+
type: string
311+
type: object
312+
public:
313+
description: Public GenericService - holds the secret
314+
for the public endpoint
315+
properties:
316+
secretName:
317+
description: SecretName - holding the cert, key for
318+
the service
319+
type: string
320+
type: object
321+
type: object
322+
caBundleSecretName:
323+
description: CaBundleSecretName - holding the CA certs in
324+
a pre-created bundle file
325+
type: string
326+
type: object
297327
required:
298328
- apiImage
299329
- databaseInstance
@@ -316,36 +346,6 @@ spec:
316346
maximum: 65535
317347
minimum: 1
318348
type: integer
319-
tls:
320-
description: TLS - Parameters related to the TLS
321-
properties:
322-
api:
323-
description: API tls type which encapsulates for API services
324-
properties:
325-
internal:
326-
description: Internal GenericService - holds the secret for
327-
the internal endpoint
328-
properties:
329-
secretName:
330-
description: SecretName - holding the cert, key for the
331-
service
332-
type: string
333-
type: object
334-
public:
335-
description: Public GenericService - holds the secret for
336-
the public endpoint
337-
properties:
338-
secretName:
339-
description: SecretName - holding the cert, key for the
340-
service
341-
type: string
342-
type: object
343-
type: object
344-
caBundleSecretName:
345-
description: CaBundleSecretName - holding the CA certs in a pre-created
346-
bundle file
347-
type: string
348-
type: object
349349
required:
350350
- heatInstance
351351
type: object

‎config/crd/bases/telemetry.openstack.org_telemetries.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,36 @@ spec:
308308
description: ServiceUser - optional username used for this
309309
service to register in keystone
310310
type: string
311+
tls:
312+
description: TLS - Parameters related to the TLS
313+
properties:
314+
api:
315+
description: API tls type which encapsulates for API services
316+
properties:
317+
internal:
318+
description: Internal GenericService - holds the secret
319+
for the internal endpoint
320+
properties:
321+
secretName:
322+
description: SecretName - holding the cert, key
323+
for the service
324+
type: string
325+
type: object
326+
public:
327+
description: Public GenericService - holds the secret
328+
for the public endpoint
329+
properties:
330+
secretName:
331+
description: SecretName - holding the cert, key
332+
for the service
333+
type: string
334+
type: object
335+
type: object
336+
caBundleSecretName:
337+
description: CaBundleSecretName - holding the CA certs
338+
in a pre-created bundle file
339+
type: string
340+
type: object
311341
required:
312342
- apiImage
313343
- databaseInstance
@@ -335,36 +365,6 @@ spec:
335365
maximum: 65535
336366
minimum: 1
337367
type: integer
338-
tls:
339-
description: TLS - Parameters related to the TLS
340-
properties:
341-
api:
342-
description: API tls type which encapsulates for API services
343-
properties:
344-
internal:
345-
description: Internal GenericService - holds the secret
346-
for the internal endpoint
347-
properties:
348-
secretName:
349-
description: SecretName - holding the cert, key for
350-
the service
351-
type: string
352-
type: object
353-
public:
354-
description: Public GenericService - holds the secret
355-
for the public endpoint
356-
properties:
357-
secretName:
358-
description: SecretName - holding the cert, key for
359-
the service
360-
type: string
361-
type: object
362-
type: object
363-
caBundleSecretName:
364-
description: CaBundleSecretName - holding the CA certs in
365-
a pre-created bundle file
366-
type: string
367-
type: object
368368
required:
369369
- heatInstance
370370
type: object

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/openstack-k8s-operators/telemetry-operator
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.1
46

57
replace github.com/openstack-k8s-operators/telemetry-operator/api => ./api
68

@@ -20,6 +22,7 @@ require (
2022
k8s.io/api v0.28.3
2123
k8s.io/apimachinery v0.28.3
2224
k8s.io/client-go v0.28.3
25+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2326
sigs.k8s.io/controller-runtime v0.16.5
2427
)
2528

@@ -83,7 +86,6 @@ require (
8386
k8s.io/component-base v0.28.3 // indirect
8487
k8s.io/klog/v2 v2.120.1 // indirect
8588
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
86-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
8789
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8890
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8991
sigs.k8s.io/yaml v1.4.0 // indirect
@@ -97,4 +99,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430
9799

98100
// needed to to cert-manager v1.11.4 see https://github.com/cert-manager/cert-manager/blob/v1.11.4/go.mod#L263C1-L264C104
99101
// remove this once we bump to cert-manager v1.12.x
100-
replace github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230519122548-219f317ae107 //allow-merging
102+
replace github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230519122548-219f317ae107 //allow-merging

‎go.sum‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8Yc
99
github.com/emicklei/go-restful/v3 v3.11.2 h1:1onLa9DcsMYO9P+CXaL0dStDqQ2EHHXLiz+BtnqkLAU=
1010
github.com/emicklei/go-restful/v3 v3.11.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1111
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
12+
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
1213
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
1314
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
1415
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -57,7 +58,9 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
5758
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
5859
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
5960
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
61+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
6062
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
63+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6164
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
6265
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
6366
github.com/metal3-io/baremetal-operator/apis v0.5.0 h1:IRaKMxRCkYfFAjvZdDyGC6bIaGQsV6MMNmGV8gqyYCc=
@@ -112,16 +115,19 @@ github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3/go.m
112115
github.com/rhobs/observability-operator v0.0.20 h1:u4Ejzq/Yt3rY4b/apKhpgYIvmp+MpcV9hhEzhzedpk4=
113116
github.com/rhobs/observability-operator v0.0.20/go.mod h1:F+exF/48C17xz9Ci9WK9Ri53Z9EZdad0otSOpeFxCXE=
114117
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
118+
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
115119
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
116120
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
117121
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
118122
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
119123
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
120124
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
125+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
121126
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
122127
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
123128
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
124129
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
130+
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
125131
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
126132
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
127133
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -195,6 +201,7 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7
195201
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
196202
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
197203
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
204+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
198205
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
199206
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
200207
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)