Skip to content

Commit

Permalink
Merge pull request #203 from omersch381/add_tls_fields
Browse files Browse the repository at this point in the history 
Add TLS field to Designate Operator API
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Aug 6, 2024
2 parents 8af4cc9 + ac21d84 commit b414b93
Show file tree
Hide file tree
Showing 23 changed files with 539 additions and 0 deletions.
30 changes: 30 additions & 0 deletions api/bases/designate.openstack.org_designateapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,36 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
api:
description: API tls type which encapsulates for API services
properties:
internal:
description: Internal GenericService - holds the secret for
the internal endpoint
properties:
secretName:
description: SecretName - holding the cert, key for the
service
type: string
type: object
public:
description: Public GenericService - holds the secret for
the public endpoint
properties:
secretName:
description: SecretName - holding the cert, key for the
service
type: string
type: object
type: object
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions api/bases/designate.openstack.org_designatecentrals.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions api/bases/designate.openstack.org_designatemdnses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions api/bases/designate.openstack.org_designateproducers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
62 changes: 62 additions & 0 deletions api/bases/designate.openstack.org_designates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,36 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
api:
description: API tls type which encapsulates for API services
properties:
internal:
description: Internal GenericService - holds the secret
for the internal endpoint
properties:
secretName:
description: SecretName - holding the cert, key for
the service
type: string
type: object
public:
description: Public GenericService - holds the secret
for the public endpoint
properties:
secretName:
description: SecretName - holding the cert, key for
the service
type: string
type: object
type: object
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -737,6 +767,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -895,6 +933,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -1053,6 +1099,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down Expand Up @@ -1320,6 +1374,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in
a pre-created bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions api/bases/designate.openstack.org_designateworkers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/designateapi_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package v1beta1
import (
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
"github.com/openstack-k8s-operators/lib-common/modules/common/service"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -72,6 +73,11 @@ type DesignateAPISpecBase struct {

// Override, provides the ability to override the generated manifest of several child resources.
Override APIOverrideSpec `json:"override,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.API `json:"tls,omitempty"`
}

// APIOverrideSpec to override the generated manifest of several child resources.
Expand Down
5 changes: 5 additions & 0 deletions api/v1beta1/designatecentral_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1beta1

import (
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -62,6 +63,10 @@ type DesignateCentralSpecBase struct {
// +kubebuilder:validation:Optional
// ServiceAccount - service account name used internally to provide Designate services the default SA name
ServiceAccount string `json:"serviceAccount"`

// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.Ca `json:"tls,omitempty"`
}

// DesignateCentralStatus defines the observed state of DesignateCentral
Expand Down
5 changes: 5 additions & 0 deletions api/v1beta1/designatemdns_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1beta1

import (
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -62,6 +63,10 @@ type DesignateMdnsSpecBase struct {
// +kubebuilder:validation:Optional
// ServiceAccount - service account name used internally to provide Designate services the default SA name
ServiceAccount string `json:"serviceAccount"`

// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.Ca `json:"tls,omitempty"`
}

// DesignateMdnsStatus defines the observed state of DesignateMdns
Expand Down
5 changes: 5 additions & 0 deletions api/v1beta1/designateproducer_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1beta1

import (
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -62,6 +63,10 @@ type DesignateProducerSpecBase struct {
// +kubebuilder:validation:Optional
// ServiceAccount - service account name used internally to provide Designate services the default SA name
ServiceAccount string `json:"serviceAccount"`

// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.Ca `json:"tls,omitempty"`
}

// DesignateProducerStatus defines the observed state of DesignateProducer
Expand Down
5 changes: 5 additions & 0 deletions api/v1beta1/designateworker_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1beta1

import (
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -62,6 +63,10 @@ type DesignateWorkerSpecBase struct {
// +kubebuilder:validation:Optional
// ServiceAccount - service account name used internally to provide Designate services the default SA name
ServiceAccount string `json:"serviceAccount"`

// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS tls.Ca `json:"tls,omitempty"`
}

// DesignateWorkerStatus defines the observed state of DesignateWorker
Expand Down
5 changes: 5 additions & 0 deletions api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions config/crd/bases/designate.openstack.org_designateapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,36 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
api:
description: API tls type which encapsulates for API services
properties:
internal:
description: Internal GenericService - holds the secret for
the internal endpoint
properties:
secretName:
description: SecretName - holding the cert, key for the
service
type: string
type: object
public:
description: Public GenericService - holds the secret for
the public endpoint
properties:
secretName:
description: SecretName - holding the cert, key for the
service
type: string
type: object
type: object
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/designate.openstack.org_designatecentrals.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/designate.openstack.org_designatemdnses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in designate
type: string
tls:
description: TLS - Parameters related to the TLS
properties:
caBundleSecretName:
description: CaBundleSecretName - holding the CA certs in a pre-created
bundle file
type: string
type: object
transportURLSecret:
description: Secret containing RabbitMq transport URL
type: string
Expand Down
Loading

0 comments on commit b414b93

Please sign in to comment.