Skip to content

Commit

Permalink
Merge pull request #380 from stuggi/tlse
Browse files Browse the repository at this point in the history 
[tlse] tls for Ironic pod configuration
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Feb 1, 2024
2 parents 5b3ea87 + a522bfe commit df1ac5e
Show file tree
Hide file tree
Showing 62 changed files with 2,437 additions and 167 deletions.
30 changes: 30 additions & 0 deletions api/bases/ironic.openstack.org_ironicapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,36 @@ spec:
default: false
description: Whether to deploy a standalone Ironic.
type: boolean
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/ironic.openstack.org_ironicconductors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,14 @@ spec:
storageRequest:
description: StorageRequest
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: TransportURLSecret - Secret containing RabbitMQ transportURL
type: string
Expand Down
30 changes: 30 additions & 0 deletions api/bases/ironic.openstack.org_ironicinspectors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,36 @@ spec:
storageClass:
description: StorageClass
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
type: object
status:
description: IronicInspectorStatus defines the observed state of IronicInspector
Expand Down
8 changes: 8 additions & 0 deletions api/bases/ironic.openstack.org_ironicneutronagents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@ spec:
description: ServiceUser - optional username used for this service
to register in ironic
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
type: object
status:
description: IronicNeutronAgentStatus defines the observed state of ML2
Expand Down
60 changes: 60 additions & 0 deletions api/bases/ironic.openstack.org_ironics.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,36 @@ spec:
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
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
type: object
ironicConductors:
description: IronicConductors - Spec definitions for the conductor
Expand Down Expand Up @@ -889,6 +919,36 @@ spec:
storageClass:
description: StorageClass
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
type: object
ironicNeutronAgent:
description: IronicNeutronAgent - Spec definition for the ML2 baremetal
Expand Down
28 changes: 14 additions & 14 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/openstack-k8s-operators/ironic-operator/api
go 1.19

require (
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011150636-e8a0540a3c32
k8s.io/api v0.26.11
k8s.io/apimachinery v0.26.11
k8s.io/client-go v0.26.11
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240117103205-2bd91a3da216
k8s.io/api v0.26.12
k8s.io/apimachinery v0.26.12
k8s.io/client-go v0.26.12
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/controller-runtime v0.14.7
)

Expand All @@ -20,7 +20,7 @@ require (
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
Expand All @@ -33,7 +33,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect; indirect // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -51,21 +51,21 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/tools v0.17.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.11 // indirect
k8s.io/component-base v0.26.11 // indirect
k8s.io/apiextensions-apiserver v0.26.12 // indirect
k8s.io/component-base v0.26.12 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit df1ac5e

Please sign in to comment.