Skip to content
This repository has been archived by the owner on Oct 20, 2022. It is now read-only.

Commit

Permalink
[Feature/Operator] Sidecars (#55)
Browse files Browse the repository at this point in the history
* bump version

* fix manager.yaml image version

* add sidecar support

* upgrade documentation dependencies and add versioned documentaiton

* improve home page

* append changelog

* generate code
  • Loading branch information
erdrix authored Jan 6, 2021
1 parent 597aa30 commit 3455a5d
Show file tree
Hide file tree
Showing 62 changed files with 28,251 additions and 2,632 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

### Added

- [PR #55](https://github.com/Orange-OpenSource/nifikop/pull/55) - **[Operator/NifiCluster]** Add the ability to define additional sidecar to each NiFi nodes.
- [PR #55](https://github.com/Orange-OpenSource/nifikop/pull/55) - **[Documentation]** Upgdrade to Docusaurus 2.0.0-alpha70 and enable versioned feature?

### Changed

### Deprecated
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/nificluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ type NifiClusterSpec struct {
//VaultConfig VaultConfig `json:"vaultConfig,omitempty"`
// listenerConfig specifies nifi's listener specifig configs
ListenersConfig ListenersConfig `json:"listenersConfig"`
// SidecarsConfig defines additional sidecar configurations
SidecarConfigs []corev1.Container `json:"sidecarConfigs,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,2,rep,name=containers"`
}

// DisruptionBudget defines the configuration for PodDisruptionBudget
Expand Down
7 changes: 7 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

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

1,086 changes: 1,086 additions & 0 deletions config/crd/bases/nifi.orange.com_nificlusters.yaml

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions config/samples/nifi_v1alpha1_nificluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ spec:
nifiClusterTaskSpec:
# retryDurationMinutes describes the amount of time the Operator waits for the task
retryDurationMinutes: 10

# listenerConfig specifies nifi's listener specifig configs
listenersConfig:
# internalListeners specifies settings required to access nifi internally
Expand Down Expand Up @@ -256,3 +257,31 @@ spec:
# issuerRef:
# name: letsencrypt-staging
# kind: Issuer
sidecarConfigs:
- name: app-log
image: "busybox:1.32.0"
args: [ tail, -n+1, -F, /var/log/nifi-app.log ]
resources: &log_resources
requests:
cpu: 50m
memory: 50Mi
limits:
cpu: 50m
memory: 50Mi
volumeMounts:
- name: logs
mountPath: /var/log
- name: bootstrap-log
image: "busybox:1.32.0"
args: [tail, -n+1, -F, /var/log/nifi-bootstrap.log]
resources: *log_resources
volumeMounts:
- name: logs
mountPath: /var/log
- name: user-log
image: "busybox:1.32.0"
args: [tail, -n+1, -F, /var/log/nifi-user.log]
resources: *log_resources
volumeMounts:
- name: logs
mountPath: /var/log
4 changes: 2 additions & 2 deletions config/samples/simplenificluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
service:
headlessEnabled: true
zkAddress: "zookeeper.nifi:2181"
zkAddress: "zookeeper.dlice:2181"
zkPath: "/simplenifi"
clusterImage: "apache/nifi:1.12.1"
oneNifiNodePerNode: false
Expand Down Expand Up @@ -48,4 +48,4 @@ spec:
containerPort: 6007
- type: "s2s"
name: "s2s"
containerPort: 10000
containerPort: 10000
1 change: 1 addition & 0 deletions helm/nifikop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ The following tables lists the configurable parameters of the NiFi Operator Helm
| `image.pullPolicy` | Image pull policy | `Always` |
| `image.imagePullSecrets.enabled` | Enable tue use of secret for docker image | `false` |
| `image.imagePullSecrets.name` | Name of the secret to connect to docker registry | - |
| `certManager.enabled` | Enable cert-manager integration | `true` |
| `rbacEnable` | If true, create & use RBAC resources | `true` |
| `resources` | Pod resource requests & limits | `{}` |
| `metricService` | deploy service for metrics | `false` |
Expand Down
Loading

0 comments on commit 3455a5d

Please sign in to comment.