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] - Adapt crds to crd review #277

Closed
wants to merge 11 commits into from
Closed

[Merged by Bors] - Adapt crds to crd review #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d4618fd
adapted crds to crd review, fixed tests (added timeouts)
maltesander Jun 6, 2022
6f8e1b6
Adapted changelog
maltesander Jun 6, 2022
87a9b79
fixed md linter
maltesander Jun 6, 2022
c00139e
added CI config files for test migration
backstreetkiwi Jun 7, 2022
32b5455
moved image/version methods to NifiCluster impl
maltesander Jun 7, 2022
6da2b40
Merge remote-tracking branch 'origin/adapt_crds_to_crd_review' into a…
maltesander Jun 7, 2022
b855907
ran pre commit for all files
maltesander Jun 7, 2022
6d9b024
adapted to pr review
maltesander Jun 8, 2022
8f699a2
Merge remote-tracking branch 'origin/main' into adapt_crds_to_crd_review
maltesander Jun 9, 2022
0ca99ec
removed redundant error
maltesander Jun 9, 2022
85babdb
fix resources test
maltesander Jun 13, 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
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ All notable changes to this project will be documented in this file.

- `operator-rs` `0.10.0` -> `0.15.0` ([#218], [#223], [#230]).
- [BREAKING] Specifying the product version has been changed to adhere to [ADR018](https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html) instead of just specifying the product version you will now have to add the Stackable image version as well, so `version: 3.5.8` becomes (for example) `version: 3.5.8-stackable0.1.0` ([#270])
- [BREAKING] CRD overhaul: Moved `authenticationConfig` to top level `config.authentication`. `SingleUser` now proper camelCase `singleUser`. `adminCredentialsSecret` now takes a String instead of `SecretReference` ([#277]).
- [BREAKING] CRD overhaul: Moved `sensitivePropertiesConfig` to top level `config.sensitiveProperties` ([#277]).

### Removed

Expand All @@ -25,6 +27,7 @@ All notable changes to this project will be documented in this file.
[#223]: https://github.com/stackabletech/nifi-operator/pull/223
[#230]: https://github.com/stackabletech/nifi-operator/pull/230
[#270]: https://github.com/stackabletech/nifi-operator/pull/270
[#277]: https://github.com/stackabletech/nifi-operator/pull/277

## [0.5.0] - 2022-02-14

Expand All @@ -38,6 +41,7 @@ All notable changes to this project will be documented in this file.
## [0.4.0] - 2021-12-06

### Added

- Support for 1.15.0 ([#125])
- Sensitive property key is setable via a secret ([#125])

Expand All @@ -56,6 +60,7 @@ All notable changes to this project will be documented in this file.
## [0.3.0] - 2021-10-27

### Added

- Added versioning code from operator-rs for up and downgrades ([#81]).
- Added `ProductVersion` to status ([#81]).
- Added `Condition` to status ([#81]).
Expand All @@ -68,8 +73,9 @@ All notable changes to this project will be documented in this file.
- `kube-rs`: `0.58` → `0.60` ([#83]).
- `k8s-openapi` `0.12` → `0.13` and features: `v1_21` → `v1_22` ([#83]).
- `operator-rs` `0.2.1` → `0.2.2` ([#83]).

### Fixed

- Fixed a bug where `wait_until_crds_present` only reacted to the main CRD, not the commands ([#92]).

[#92]: https://github.com/stackabletech/nifi-operator/pull/92
Expand All @@ -80,6 +86,7 @@ All notable changes to this project will be documented in this file.
## [0.2.0] - 2021-09-14

### Changed

- **Breaking:** Repository structure was changed and the -server crate renamed to -binary. As part of this change the -server suffix was removed from both the package name for os packages and the name of the executable ([#72]).

[#72]: https://github.com/stackabletech/nifi-operator/pull/72
Expand Down
94 changes: 46 additions & 48 deletions deploy/crd/nificluster.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,60 @@ spec:
properties:
spec:
properties:
authenticationConfig:
description: A reference to a Secret containing username/password for the initial admin user
config:
description: Global Nifi config for e.g. authentication or sensitive properties
properties:
allowAnonymousAccess:
nullable: true
type: boolean
method:
oneOf:
- required:
- SingleUser
authentication:
description: A reference to a Secret containing username/password for the initial admin user
properties:
SingleUser:
allowAnonymousAccess:
nullable: true
type: boolean
method:
oneOf:
- required:
- singleUser
properties:
adminCredentialsSecret:
description: SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace
singleUser:
properties:
name:
description: Name is unique within a namespace to reference a secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret name must be unique.
adminCredentialsSecret:
type: string
autoGenerate:
default: false
type: boolean
required:
- adminCredentialsSecret
type: object
autoGenerate:
default: false
type: boolean
required:
- adminCredentialsSecret
type: object
required:
- method
type: object
sensitiveProperties:
description: Configuration options for how NiFi encrypts sensitive properties on disk
properties:
algorithm:
enum:
- nifiArgon2AesGcm128
- nifiArgon2AesGcm256
- nifiBcryptAesGcm128
- nifiBcryptAesGcm256
- nifiPbkdf2AesGcm128
- nifiPbkdf2AesGcm256
- nifiScryptAesGcm128
- nifiScryptAesGcm256
nullable: true
type: string
autoGenerate:
default: false
type: boolean
keySecret:
type: string
required:
- keySecret
type: object
required:
- method
- authentication
- sensitiveProperties
type: object
nodes:
description: Available NiFi roles
Expand Down Expand Up @@ -661,29 +683,6 @@ spec:
required:
- roleGroups
type: object
sensitivePropertiesConfig:
description: Configuration options for how NiFi encrypts sensitive properties on disk
properties:
algorithm:
enum:
- nifiArgon2AesGcm128
- nifiArgon2AesGcm256
- nifiBcryptAesGcm128
- nifiBcryptAesGcm256
- nifiPbkdf2AesGcm128
- nifiPbkdf2AesGcm256
- nifiScryptAesGcm128
- nifiScryptAesGcm256
nullable: true
type: string
autoGenerate:
default: false
type: boolean
keySecret:
type: string
required:
- keySecret
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 All @@ -696,8 +695,7 @@ spec:
description: The reference to the ZooKeeper cluster
type: string
required:
- authenticationConfig
- sensitivePropertiesConfig
- config
- zookeeperConfigMapName
type: object
status:
Expand Down
94 changes: 46 additions & 48 deletions deploy/helm/nifi-operator/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,60 @@ spec:
properties:
spec:
properties:
authenticationConfig:
description: A reference to a Secret containing username/password for the initial admin user
config:
description: Global Nifi config for e.g. authentication or sensitive properties
properties:
allowAnonymousAccess:
nullable: true
type: boolean
method:
oneOf:
- required:
- SingleUser
authentication:
description: A reference to a Secret containing username/password for the initial admin user
properties:
SingleUser:
allowAnonymousAccess:
nullable: true
type: boolean
method:
oneOf:
- required:
- singleUser
properties:
adminCredentialsSecret:
description: SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace
singleUser:
properties:
name:
description: Name is unique within a namespace to reference a secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret name must be unique.
adminCredentialsSecret:
type: string
autoGenerate:
default: false
type: boolean
required:
- adminCredentialsSecret
type: object
autoGenerate:
default: false
type: boolean
required:
- adminCredentialsSecret
type: object
required:
- method
type: object
sensitiveProperties:
description: Configuration options for how NiFi encrypts sensitive properties on disk
properties:
algorithm:
enum:
- nifiArgon2AesGcm128
- nifiArgon2AesGcm256
- nifiBcryptAesGcm128
- nifiBcryptAesGcm256
- nifiPbkdf2AesGcm128
- nifiPbkdf2AesGcm256
- nifiScryptAesGcm128
- nifiScryptAesGcm256
nullable: true
type: string
autoGenerate:
default: false
type: boolean
keySecret:
type: string
required:
- keySecret
type: object
required:
- method
- authentication
- sensitiveProperties
type: object
nodes:
description: Available NiFi roles
Expand Down Expand Up @@ -663,29 +685,6 @@ spec:
required:
- roleGroups
type: object
sensitivePropertiesConfig:
description: Configuration options for how NiFi encrypts sensitive properties on disk
properties:
algorithm:
enum:
- nifiArgon2AesGcm128
- nifiArgon2AesGcm256
- nifiBcryptAesGcm128
- nifiBcryptAesGcm256
- nifiPbkdf2AesGcm128
- nifiPbkdf2AesGcm256
- nifiScryptAesGcm128
- nifiScryptAesGcm256
nullable: true
type: string
autoGenerate:
default: false
type: boolean
keySecret:
type: string
required:
- keySecret
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 All @@ -698,8 +697,7 @@ spec:
description: The reference to the ZooKeeper cluster
type: string
required:
- authenticationConfig
- sensitivePropertiesConfig
- config
- zookeeperConfigMapName
type: object
status:
Expand Down
Loading