Skip to content
This repository was archived by the owner on Nov 12, 2024. It is now read-only.

Commit 645b768

Browse files
author
Gene Hynson
authored
Merge pull request #19 from Orange-OpenSource/master
chore: merge with upstream
2 parents 5f0931a + 83edc14 commit 645b768

File tree

58 files changed

+7373
-4855
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+7373
-4855
lines changed

‎CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,25 @@
1010

1111
### Fixed Bugs
1212

13+
## v0.7.6
14+
15+
### Added
16+
17+
- [PR #191](https://github.com/Orange-OpenSource/nifikop/pull/191) - **[Operator/NiFiDataflow]** Add event on registry client reference error.
18+
- [PR #190](https://github.com/Orange-OpenSource/nifikop/pull/190) - **[Operator/NiFiDataflow]** New parameter: `flowPosition`.
19+
20+
### Changed
21+
22+
- [PR #188](https://github.com/Orange-OpenSource/nifikop/pull/188) - **[Operator/NiFiCluster]** Support all pod status as terminating if the pod phase is `failed`.
23+
24+
### Fixed Bugs
25+
1326
- [PR #167](https://github.com/Orange-OpenSource/nifikop/pull/167) - **[Operator/NiFiDataflow]** Fix nil pointer exception case whe sync Dataflow.
27+
- [PR #189](https://github.com/Orange-OpenSource/nifikop/pull/189) - **[Operator/NiFiParameterContext]** Fix nil pointer exception case on empty description.
28+
- [PR #193](https://github.com/Orange-OpenSource/nifikop/pull/193) - **[Documentation]** Fix some missinformation.
29+
- [PR #196](https://github.com/Orange-OpenSource/nifikop/pull/196) - **[Operator/NiFiParameterContext]** Fix non-update of parameter context.
30+
- [PR #197](https://github.com/Orange-OpenSource/nifikop/pull/197) - **[Operator/NiFiDataflow]** Keep Helm chart CRDs inline with baseline.
31+
- [PR #198](https://github.com/Orange-OpenSource/nifikop/pull/198) - **[Documentation]** Fix versionned doc.
1432

1533
## v0.7.5
1634

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ else
3030
ifdef CIRCLE_TAG
3131
BRANCH := $(CIRCLE_TAG)
3232
else
33-
BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
33+
BRANCH=$(shell git rev-parse --abbrev-ref HEAD | sed -e 's/\//_/')
3434
endif
3535
endif
3636

@@ -90,7 +90,7 @@ generate: controller-gen
9090

9191
# Generate manifests e.g. CRD, RBAC etc.
9292
manifests: controller-gen
93-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
93+
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases output:crd:artifacts:config=helm/nifikop/crds
9494

9595
# Build the docker image
9696
docker-build:

‎api/v1alpha1/nifidataflow_types.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ type NifiDataflowSpec struct {
3131
BucketId string `json:"bucketId"`
3232
// the UUID of the flow to run.
3333
FlowId string `json:"flowId"`
34-
// the version of the flow to run, if not present or equals to -1, then the latest version of flow will be used.
34+
// the version of the flow to run, then the latest version of flow will be used.
3535
FlowVersion *int32 `json:"flowVersion,omitempty"`
36+
// the position of your dataflow in the canvas.
37+
FlowPosition *FlowPosition `json:"flowPosition,omitempty"`
3638
// contains the reference to the ParameterContext with the one the dataflow is linked.
3739
ParameterContextRef *ParameterContextReference `json:"parameterContextRef,omitempty"`
3840
// if the flow will be synchronized once, continuously or never
@@ -51,6 +53,13 @@ type NifiDataflowSpec struct {
5153
UpdateStrategy DataflowUpdateStrategy `json:"updateStrategy"`
5254
}
5355

56+
type FlowPosition struct {
57+
// The x coordinate.
58+
X *int64 `json:"posX,omitempty"`
59+
// The y coordinate.
60+
Y *int64 `json:"posY,omitempty"`
61+
}
62+
5463
type UpdateRequest struct {
5564
// defines the type of versioned flow update request.
5665
Type DataflowUpdateRequestType `json:"type"`

‎api/v1alpha1/zz_generated.deepcopy.go

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/nifi.orange.com_nifidataflows.yaml

+14-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,21 @@ spec:
5353
flowId:
5454
description: the UUID of the flow to run.
5555
type: string
56+
flowPosition:
57+
description: the position of your dataflow in the canvas.
58+
properties:
59+
posX:
60+
description: The x coordinate.
61+
format: int64
62+
type: integer
63+
posY:
64+
description: The y coordinate.
65+
format: int64
66+
type: integer
67+
type: object
5668
flowVersion:
57-
description: the version of the flow to run, if not present or equals
58-
to -1, then the latest version of flow will be used.
69+
description: the version of the flow to run, then the latest version
70+
of flow will be used.
5971
format: int32
6072
type: integer
6173
parameterContextRef:

‎config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- /manager
3030
args:
3131
- --leader-elect
32-
image: orangeopensource/nifikop:v0.7.3-release
32+
image: orangeopensource/nifikop:v0.7.6-release
3333
name: nifikop
3434
securityContext:
3535
allowPrivilegeEscalation: false

‎config/samples/keycloak-example/step-1/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nifikop 0.7.5
1+
# nifikop 0.7.6
22
rbacEnable: true
33
namespaces:
44
- nifi

‎config/samples/nifi_v1alpha1_nifidataflow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
bucketId: "01ced6cc-0378-4893-9403-f6c70d080d4f"
1010
# the UUID of the flow to run.
1111
flowId: "9b2fb465-fb45-49e7-94fe-45b16b642ac9"
12-
# the version of the flow to run, if not present or equals to -1, then the latest version of flow will be used.
12+
# the version of the flow to run.
1313
flowVersion: 2
1414
# if the flow will be ran once or continuously checked
1515
syncMode: always

‎controllers/nifidataflow_controller.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ package controllers
1818

1919
import (
2020
"context"
21-
"emperror.dev/errors"
2221
"encoding/json"
2322
"fmt"
23+
"reflect"
24+
"strconv"
25+
"time"
26+
27+
"emperror.dev/errors"
2428
"github.com/Orange-OpenSource/nifikop/pkg/clientwrappers/dataflow"
2529
"github.com/Orange-OpenSource/nifikop/pkg/errorfactory"
2630
"github.com/Orange-OpenSource/nifikop/pkg/k8sutil"
@@ -31,10 +35,7 @@ import (
3135
corev1 "k8s.io/api/core/v1"
3236
apierrors "k8s.io/apimachinery/pkg/api/errors"
3337
"k8s.io/client-go/tools/record"
34-
"reflect"
3538
"sigs.k8s.io/controller-runtime/pkg/reconcile"
36-
"strconv"
37-
"time"
3839

3940
"github.com/go-logr/logr"
4041
"k8s.io/apimachinery/pkg/runtime"
@@ -125,6 +126,10 @@ func (r *NifiDataflowReconciler) Reconcile(ctx context.Context, req ctrl.Request
125126
return Reconciled()
126127
}
127128

129+
r.Recorder.Event(instance, corev1.EventTypeWarning, "ReferenceRegistryClientError",
130+
fmt.Sprintf("Failed to lookup reference registry client : %s in %s",
131+
current.Spec.RegistryClientRef.Name, registryClientNamespace))
132+
128133
// the cluster does not exist - should have been caught pre-flight
129134
return RequeueWithError(r.Log, "failed to lookup referenced registry client", err)
130135
}

‎helm/nifikop/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: nifikop
44
home: https://github.com/Orange-OpenSource/nifikop
55
sources:
66
- https://github.com/Orange-OpenSource/nifikop
7-
version: 0.7.5
8-
appVersion: 0.7.5-release
7+
version: 0.7.6
8+
appVersion: 0.7.6-release
99
icon:
1010
maintainers:
1111
- name: erdrix

‎helm/nifikop/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ The following tables lists the configurable parameters of the NiFi Operator Helm
2323
| Parameter | Description | Default |
2424
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------- |
2525
| `image.repository` | Image | `orangeopensource/nifikop` |
26-
| `image.tag` | Image tag | `v0.7.5-release` |
26+
| `image.tag` | Image tag | `v0.7.6-release` |
2727
| `image.pullPolicy` | Image pull policy | `Always` |
2828
| `image.imagePullSecrets.enabled` | Enable tue use of secret for docker image | `false` |
2929
| `image.imagePullSecrets.name` | Name of the secret to connect to docker registry | - |
3030
| `certManager.enabled` | Enable cert-manager integration | `true` |
3131
| `rbacEnable` | If true, create & use RBAC resources | `true` |
3232
| `resources` | Pod resource requests & limits | `{}` |
3333
| `metrics.enabled` | deploy service for metrics | `false` |
34-
| `metrics.port` | Set port for operator metrics | `8081` |
34+
| `metrics.port` | Set port for operator metrics | `8081` |
3535
| `debug.enabled` | activate DEBUG log level | `false` |
3636
| `certManager.clusterScoped` | If true setup cluster scoped resources | `false` |
3737
| `namespaces` | List of namespaces where Operator watches for custom resources. Make sure the operator ServiceAccount is granted `get` permissions on this `Node` resource when using limited RBACs. | `""` i.e. all namespaces |

0 commit comments

Comments
 (0)