Skip to content

Commit

Permalink
adds AdditionalNifiEnvs to Node.ReadOnlyConfig to define a set of add…
Browse files Browse the repository at this point in the history 
…itional env variables that will only be embed in the nifi container
  • Loading branch information
@mheers
mheers committed Apr 19, 2024
1 parent f4ce2cf commit 385f97a
Show file tree
Hide file tree
Showing 9 changed files with 399 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- [PR #415](https://github.com/konpyutaika/nifikop/pull/415) - **[Operator]** Upgrade golang to 1.22.2.
- [PR #416](https://github.com/konpyutaika/nifikop/pull/416) - **[Operator]** Certmanager-user: k8sutil: corrects IsAlreadyOwnedError.
- [PR #416](https://github.com/konpyutaika/nifikop/pull/394) - **[Operator/NifiCluster]** Added support to let users configure AdditionalNifiEnvs.

### Fixed Bugs

Expand Down
2 changes: 2 additions & 0 deletions api/v1/nificluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ type ReadOnlyConfig struct {
// AdditionalSharedEnvs define a set of additional env variables that will shared between all init containers and
// containers in the pod.
AdditionalSharedEnvs []corev1.EnvVar `json:"additionalSharedEnvs,omitempty"`
// AdditionalNifiEnvs define a set of additional env variables that will only be embed in the nifi container.
AdditionalNifiEnvs []corev1.EnvVar `json:"additionalNifiEnvs,omitempty"`
// NifiProperties configuration that will be applied to the node.
NifiProperties NifiProperties `json:"nifiProperties,omitempty"`
// ZookeeperProperties configuration that will be applied to the node.
Expand Down
7 changes: 7 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file

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

128 changes: 128 additions & 0 deletions config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3033,6 +3033,70 @@ spec:
type: string
readOnlyConfig:
properties:
additionalNifiEnvs:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
additionalSharedEnvs:
items:
properties:
Expand Down Expand Up @@ -3472,6 +3536,70 @@ spec:
type: string
readOnlyConfig:
properties:
additionalNifiEnvs:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
additionalSharedEnvs:
items:
properties:
Expand Down
64 changes: 64 additions & 0 deletions config/crd/bases/nifi.konpyutaika.com_nifinodegroupautoscalers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,70 @@ spec:
x-kubernetes-map-type: atomic
readOnlyConfig:
properties:
additionalNifiEnvs:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
additionalSharedEnvs:
items:
properties:
Expand Down
128 changes: 128 additions & 0 deletions helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3033,6 +3033,70 @@ spec:
type: string
readOnlyConfig:
properties:
additionalNifiEnvs:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
additionalSharedEnvs:
items:
properties:
Expand Down Expand Up @@ -3472,6 +3536,70 @@ spec:
type: string
readOnlyConfig:
properties:
additionalNifiEnvs:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
additionalSharedEnvs:
items:
properties:
Expand Down
Loading

0 comments on commit 385f97a

Please sign in to comment.