forked from openstack-k8s-operators/placement-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tlse] tls for PlacementAPI pod configuration
Public/Internal service cert secrets and the CA bundle secret can be passed to configure httpd virtual hosts for tls termination. The certs are mounted to in var/lib/config-data/tls/certs/%s.crt|key and a CA bundle to /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem. Server cert and key are intended to be moved by kolla to /etc/pki/tls/certs|private. Depends-On: openstack-k8s-operators/lib-common#428 Depends-On: openstack-k8s-operators/openstack-operator#625 Signed-off-by: Veronika Fisarova <[email protected]>
- Loading branch information
Showing
11 changed files
with
80 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,14 @@ | ||
| apiVersion: placement.openstack.org/v1beta1 | ||
| kind: PlacementAPI | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: placement | ||
| spec: | ||
| tls: | ||
| api: | ||
| internal: | ||
| secretName: cert-internal-svc | ||
| public: | ||
| secretName: cert-public-svc | ||
| caBundleSecretName: combined-ca-bundle | ||
| name: cert-internal-svc | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: placement | ||
| spec: | ||
| replicas: 1 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| service: keystone | ||
| spec: | ||
| containers: | ||
| volumeMounts: | ||
| - mountPath: /var/lib/config-data/tls/certs/internal.crt | ||
| name: internal-tls-certs | ||
| readOnly: true | ||
| subPath: tls.crt | ||
| - mountPath: /var/lib/config-data/tls/private/internal.key | ||
| name: internal-tls-certs | ||
| readOnly: true | ||
| subPath: tls.key | ||
| - mountPath: /var/lib/config-data/tls/certs/public.crt | ||
| name: public-tls-certs | ||
| readOnly: true | ||
| subPath: tls.crt | ||
| - mountPath: /var/lib/config-data/tls/private/public.key | ||
| name: public-tls-certs | ||
| readOnly: true | ||
| subPath: tls.key | ||
| - mountPath: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem | ||
| name: combined-ca-bundle | ||
| readOnly: true | ||
| name: cert-public-svc | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: combined-ca-bundle |
File renamed without changes.
1 change: 1 addition & 0 deletions
1
tests/kuttl/tests/placement_deploy_tls/02-placementapi_deploy_tls.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../../config/samples/placement_v1beta1_placementtls.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| apiVersion: placement.openstack.org/v1beta1 | ||
| kind: PlacementAPI | ||
| metadata: | ||
| finalizers: | ||
| - PlacementAPI | ||
| name: placement | ||
| spec: | ||
| customServiceConfig: | | ||
| [DEFAULT] | ||
| debug = true | ||
| databaseInstance: openstack | ||
| databaseUser: placement | ||
| debug: | ||
| dbSync: false | ||
| service: false | ||
| passwordSelectors: | ||
| database: PlacementDatabasePassword | ||
| service: PlacementPassword | ||
| preserveJobs: false | ||
| replicas: 1 | ||
| secret: osp-secret | ||
| serviceUser: placement | ||
| tls: | ||
| api: | ||
| internal: | ||
| secretName: cert-internal-svc | ||
| public: | ||
| secretName: cert-public-svc | ||
| caBundleSecretName: combined-ca-bundle | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: placement | ||
| spec: | ||
| replicas: 1 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| service: placement | ||
| spec: | ||
| containers: | ||
| volumeMounts: | ||
| - mountPath: /var/lib/config-data/tls/certs | ||
| name: internal-tls-certs | ||
| readOnly: true | ||
| subPath: tls.crt | ||
| - mountPath: /var/lib/config-data/tls/private | ||
| name: internal-tls-certs | ||
| readOnly: true | ||
| subPath: tls.key | ||
| - mountPath: /var/lib/config-data/tls/certs | ||
| name: public-tls-certs | ||
| readOnly: true | ||
| subPath: tls.crt | ||
| - mountPath: /var/lib/config-data/tls/private | ||
| name: public-tls-certs | ||
| readOnly: true | ||
| subPath: tls.key | ||
| - mountPath: /etc/pki/ca-trust/extracted/pem | ||
| name: combined-ca-bundle | ||
| readOnly: true | ||
| subPath: tls-ca-bundle.pem |
1 change: 1 addition & 0 deletions
1
tests/kuttl/tests/placement_deploy_tls/03-patch_placement_deploy.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../common/patch_placement_deploy.yaml |
1 change: 1 addition & 0 deletions
1
tests/kuttl/tests/placement_deploy_tls/04-cleanup-placement.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../common/cleanup-placement.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../common/errors_cleanup_placement.yaml |