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

Commit

Permalink
[HotFix/Dataflow] Mandatory Position x and y (#160)
Browse files Browse the repository at this point in the history 
* fix operator metrics configuration

* append changelog

* fix optinal parameter context and support empty array for parameter context

* bump version and append changelog

* updgrade dependency

* bump version
  • Loading branch information
@erdrix
erdrix authored Nov 17, 2021
1 parent de9c802 commit ddd36c1
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 14 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

### Fixed Bugs

## v0.7.4

### Fixed Bugs

- [PR #160](https://github.com/Orange-OpenSource/nifikop/pull/160) - **[Dataflow]** Mandatory Position x and y.

## v0.7.3

### Fixed Bugs
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/antihax/optional v1.0.0
github.com/banzaicloud/k8s-objectmatcher v1.4.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/erdrix/nigoapi v0.0.0-20211112150537-d8047033a68a
github.com/erdrix/nigoapi v0.0.0-20211117113337-5c8957d8be51
github.com/go-logr/logr v0.3.0
github.com/imdario/mergo v0.3.10
github.com/jarcoal/httpmock v1.0.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/erdrix/nigoapi v0.0.0-20211112150537-d8047033a68a h1:isV4zYi8OKvV7XK4tPDJQ+i383uDZ/wTqzjqAMu/FpM=
github.com/erdrix/nigoapi v0.0.0-20211112150537-d8047033a68a/go.mod h1:owY+8fs8YXnST3ENM+ulVllYjTbzGaqKA+Y7HHJ0lZA=
github.com/erdrix/nigoapi v0.0.0-20211117113337-5c8957d8be51 h1:NRUQIRX+cezoNs12maIay9CmeDjfLBiXdNHkoaggzgo=
github.com/erdrix/nigoapi v0.0.0-20211117113337-5c8957d8be51/go.mod h1:owY+8fs8YXnST3ENM+ulVllYjTbzGaqKA+Y7HHJ0lZA=
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
Expand Down
4 changes: 2 additions & 2 deletions helm/nifikop/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: nifikop
home: https://github.com/Orange-OpenSource/nifikop
sources:
- https://github.com/Orange-OpenSource/nifikop
version: 0.7.3
appVersion: 0.7.3-release
version: 0.7.4
appVersion: 0.7.4-release
icon:
maintainers:
- name: erdrix
Expand Down
2 changes: 1 addition & 1 deletion helm/nifikop/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The following tables lists the configurable parameters of the NiFi Operator Helm
| Parameter | Description | Default |
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------- |
| `image.repository` | Image | `orangeopensource/nifikop` |
| `image.tag` | Image tag | `v0.7.3-release` |
| `image.tag` | Image tag | `v0.7.4-release` |
| `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 | - |
Expand Down
2 changes: 1 addition & 1 deletion helm/nifikop/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##
image:
repository: orangeopensource/nifikop
tag: v0.7.3-release
tag: v0.7.4-release
pullPolicy: Always
imagePullSecrets:
enabled: false
Expand Down
10 changes: 7 additions & 3 deletions pkg/resources/nifi/nifi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package nifi
import (
"context"
"fmt"
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/dataflow"
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/scale"
"github.com/Orange-OpenSource/nifikop/pkg/nificlient/config"
"github.com/Orange-OpenSource/nifikop/pkg/pki"
nifiutil "github.com/Orange-OpenSource/nifikop/pkg/util/nifi"
Expand All @@ -26,10 +28,8 @@ import (
"emperror.dev/errors"
"github.com/Orange-OpenSource/nifikop/api/v1alpha1"
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/controllersettings"
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/dataflow"
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/reportingtask"

"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/scale"
"github.com/Orange-OpenSource/nifikop/pkg/errorfactory"
"github.com/Orange-OpenSource/nifikop/pkg/k8sutil"
"github.com/Orange-OpenSource/nifikop/pkg/resources"
Expand Down Expand Up @@ -621,7 +621,9 @@ func (r *Reconciler) reconcileNifiPod(log logr.Logger, desiredPod *corev1.Pod) (
if err != nil {
log.Error(err, "could not match objects", "kind", desiredType)
} else if patchResult.IsEmpty() {
if !k8sutil.IsPodTerminatedOrShutdown(currentPod) && r.NifiCluster.Status.NodesState[currentPod.Labels["nodeId"]].ConfigurationState == v1alpha1.ConfigInSync {
if !k8sutil.IsPodTerminatedOrShutdown(currentPod) &&
r.NifiCluster.Status.NodesState[currentPod.Labels["nodeId"]].ConfigurationState == v1alpha1.ConfigInSync {

if val, found := r.NifiCluster.Status.NodesState[desiredPod.Labels["nodeId"]]; found &&
val.GracefulActionState.State == v1alpha1.GracefulUpscaleRunning &&
val.GracefulActionState.ActionStep == v1alpha1.ConnectStatus &&
Expand All @@ -633,6 +635,8 @@ func (r *Reconciler) reconcileNifiPod(log logr.Logger, desiredPod *corev1.Pod) (
err, "could not update node graceful action state"), false
}
}


log.V(1).Info("resource is in sync")
return nil, k8sutil.PodReady(currentPod)
}
Expand Down
4 changes: 2 additions & 2 deletions site/docs/2_setup/1_getting_started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Now deploy the helm chart :
helm install nifikop \
orange-incubator/nifikop \
--namespace=nifi \
--version 0.7.3 \
--set image.tag=v0.7.3-release \
--version 0.7.4 \
--set image.tag=v0.7.4-release \
--set resources.requests.memory=256Mi \
--set resources.requests.cpu=250m \
--set resources.limits.memory=256Mi \
Expand Down
2 changes: 1 addition & 1 deletion site/docs/2_setup/3_install/1_customizable_install_with_helm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The following tables lists the configurable parameters of the NiFi Operator Helm
| Parameter | Description | Default |
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------- |
| `image.repository` | Image | `orangeopensource/nifikop` |
| `image.tag` | Image tag | `v0.7.3-release` |
| `image.tag` | Image tag | `v0.7.4-release` |
| `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 | - |
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

var (
Version = "0.7.3"
Version = "0.7.4"
)

0 comments on commit ddd36c1

Please sign in to comment.