Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Rework s3 configuration #179

Closed
wants to merge 23 commits into from
Closed

[Merged by Bors] - Rework s3 configuration #179

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b6cf866
updated to operator-rs 0.19.0
maltesander May 10, 2022
90bb343
WIP
maltesander May 10, 2022
837be36
HADOOP_OPTS -> HIVE_METASTORE_HADOOP_OPTS
maltesander May 10, 2022
e8f50f3
added warning if TLS is provided in S3 connection. Changed accessKeyI…
maltesander May 11, 2022
57453e0
improved examples and docs with minio.
maltesander May 11, 2022
e4f3746
adapted examples
maltesander May 11, 2022
775d7d3
Adapted changelog
maltesander May 11, 2022
594cb61
adapted to pr review
maltesander May 11, 2022
ae8d78b
fixed derby path in example
maltesander May 11, 2022
a2ec62e
adapted example
maltesander May 11, 2022
4548dec
switched to main branch for now, regenerated charts with ne path styl…
maltesander May 11, 2022
a2c200d
accessStyle now configurable
maltesander May 11, 2022
850eb67
fixed clippy
maltesander May 11, 2022
d07a123
workaround to write s3 access and secret keys
maltesander May 13, 2022
e87a319
improved logging
maltesander May 13, 2022
c1ee16e
adapted to operator-rs tag 0.20.0
maltesander May 13, 2022
ba60bc8
adapted to pr review.
maltesander May 16, 2022
271f23f
Adapted to operator-rs changes
maltesander May 17, 2022
e98c91f
Merge branch 'main' into rework_s3_configuration
sbernauer May 17, 2022
a786b5b
Update operator-rs branch to main
sbernauer May 17, 2022
0e6354b
switched to operator-rs 0.21.0
maltesander May 17, 2022
76ddc3f
Merge remote-tracking branch 'origin/rework_s3_configuration' into re…
maltesander May 17, 2022
2c569ae
switched to operator-rs 0.21.0
maltesander May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ All notable changes to this project will be documented in this file.

### Changed

- `operator-rs` `0.10.0` -> `0.17.0` ([#137], [#142], [#168]).
- `operator-rs` `0.10.0` -> `0.19.0` ([#137], [#142], [#168], [#179]).
- Adapted S3 connection to operator-rs provided structs ([#179]).

[#137]: https://github.com/stackabletech/hive-operator/pull/137
[#142]: https://github.com/stackabletech/hive-operator/pull/142
[#168]: https://github.com/stackabletech/hive-operator/pull/168
[#179]: https://github.com/stackabletech/hive-operator/pull/179

## [0.5.0] - 2022-02-14

Expand Down
101 changes: 64 additions & 37 deletions Cargo.lock
View file
Open in desktop

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

114 changes: 72 additions & 42 deletions deploy/crd/hivecluster.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,6 @@ spec:
- password
- user
type: object
s3Connection:
description: Contains all the required connection information for S3.
nullable: true
properties:
accessKey:
type: string
endPoint:
type: string
pathStyleAccess:
type: boolean
secretKey:
type: string
sslEnabled:
type: boolean
required:
- accessKey
- endPoint
- pathStyleAccess
- secretKey
- sslEnabled
type: object
warehouseDir:
nullable: true
type: string
Expand Down Expand Up @@ -135,27 +114,6 @@ spec:
- password
- user
type: object
s3Connection:
description: Contains all the required connection information for S3.
nullable: true
properties:
accessKey:
type: string
endPoint:
type: string
pathStyleAccess:
type: boolean
secretKey:
type: string
sslEnabled:
type: boolean
required:
- accessKey
- endPoint
- pathStyleAccess
- secretKey
- sslEnabled
type: object
warehouseDir:
nullable: true
type: string
Expand Down Expand Up @@ -213,6 +171,78 @@ spec:
required:
- roleGroups
type: object
s3:
description: Operators are expected to define fields for this type in order to work with S3 connections.
nullable: true
oneOf:
- required:
- inline
- required:
- reference
properties:
inline:
description: S3 connection definition as CRD.
properties:
accessStyle:
enum:
- Path
- VirtualHosted
nullable: true
type: string
host:
nullable: true
type: string
port:
format: uint16
minimum: 0.0
nullable: true
type: integer
secretClass:
nullable: true
type: string
tls:
nullable: true
properties:
verification:
description: The verification method used to verify the certificates of the server and/or the client
oneOf:
- required:
- none
- required:
- server
properties:
none:
description: "Use TLS but don't verify certificates"
type: object
server:
description: Use TLS and ca certificate to verify the server
properties:
caCert:
description: Ca cert to verify the server
oneOf:
- required:
- webPki
- required:
- secretClass
properties:
secretClass:
description: "Name of the SecretClass which will provide the ca cert. Note that a SecretClass does not need to have a key but can also work with just a ca cert. So if you got provided with a ca cert but don't have access to the key you can still use this method."
type: string
webPki:
description: Use TLS and the ca certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
type: object
type: object
required:
- caCert
type: object
type: object
required:
- verification
type: object
type: object
reference:
type: string
type: object
stopped:
description: "Emergency stop button, if `true` then all pods are stopped without affecting configuration (as setting `replicas` to `0` would)"
nullable: true
Expand Down
Loading