[Fix/Documentation] Pattern & versions (Orange-OpenSource#24)

* fix documentation Signed-off-by: erdrix <[email protected]> * append changelog * append changelog Signed-off-by: erdrix <[email protected]>
erdrix · Sep 16, 2020 · 589a0d6 · 589a0d6
1 parent f9f80d9
commit 589a0d6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 ### Fixed Bugs
 
+- [PR #24](https://github.com/Orange-OpenSource/nifikop/pull/24) - [Documentation] Correct patterns & versions.
+
 ## v0.2.0-release
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ BUILD_IMAGE				?= orangeopensource/nifikop-build
 
 OPERATOR_SDK_VERSION=v0.18.0
 # workdir
-WORKDIR := /go/casskop
+WORKDIR := /go/nifikop
 
 # Debug variables
 TELEPRESENCE_REGISTRY ?= datawire

diff --git a/config/samples/simplenificluster.yaml b/config/samples/simplenificluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: simplenifi
 spec:
   service:
-    headlesseEnabled: true
+    headlessEnabled: true
   zkAddresse: "zookeepercluster-client.zookeeper:2181"
   zkPath: "/simplenifi"
   clusterImage: "apache/nifi:1.11.3"

diff --git a/config/samples/tls_secured_nificluster.yaml b/config/samples/tls_secured_nificluster.yaml
@@ -26,7 +26,7 @@ spec:
         nifi.security.user.oidc.discovery.url=https://accounts.google.com/.well-known/openid-configuration
         nifi.security.user.oidc.client.id=930711295780-i72an91pqj7rib88r23qfv5q7mth8hgv.apps.googleusercontent.com
         nifi.security.user.oidc.client.secret=BvmEyr81P0YXZtIt1FIfGsRs
-        nifi.security.identity.mapping.pattern.dn=CN=(.*)(?:, (?:O|OU)=.*)?
+        nifi.security.identity.mapping.pattern.dn=CN=([^,]*)(?:, (?:O|OU)=.*)?
         nifi.security.identity.mapping.value.dn=$1
         nifi.security.identity.mapping.transform.dn=NONE
   nodeConfigGroups:

diff --git a/docs/tutorials/secured_nifi_cluster_on_gcp/kubernetes/nifi/secured_nifi_cluster.yaml b/docs/tutorials/secured_nifi_cluster_on_gcp/kubernetes/nifi/secured_nifi_cluster.yaml
@@ -23,7 +23,7 @@ spec:
         nifi.security.user.oidc.discovery.url=https://accounts.google.com/.well-known/openid-configuration
         nifi.security.user.oidc.client.id=<oidc client's id>
         nifi.security.user.oidc.client.secret=<oidc client's secret>
-        nifi.security.identity.mapping.pattern.dn=CN=(.*)(?:, (?:O|OU)=.*)?
+        nifi.security.identity.mapping.pattern.dn=CN=([^,]*)(?:, (?:O|OU)=.*)?
         nifi.security.identity.mapping.value.dn=$1
         nifi.security.identity.mapping.transform.dn=NONE
         nifi.nar.library.autoload.directory=../extensions

diff --git a/...s/secured_nifi_cluster_on_gcp_with_external_dns/kubernetes/nifi/secured_nifi_cluster.yaml b/...s/secured_nifi_cluster_on_gcp_with_external_dns/kubernetes/nifi/secured_nifi_cluster.yaml
@@ -29,7 +29,7 @@ spec:
         nifi.security.user.oidc.discovery.url=https://accounts.google.com/.well-known/openid-configuration
         nifi.security.user.oidc.client.id=930711295780-m4ruikt5ung1pu6ria2q2qjekcebn2sc.apps.googleusercontent.com
         nifi.security.user.oidc.client.secret=jmHduX0gH8WeM7Zks1dyA3ab
-        nifi.security.identity.mapping.pattern.dn=CN=(.*)(?:, (?:O|OU)=.*)?
+        nifi.security.identity.mapping.pattern.dn=CN=([^,]*)(?:, (?:O|OU)=.*)?
         nifi.security.identity.mapping.value.dn=$1
         nifi.security.identity.mapping.transform.dn=NONE
   nodeConfigGroups:

diff --git a/website/docs/3_tasks/2_security/2_authentication/1_oidc.md b/website/docs/3_tasks/2_security/2_authentication/1_oidc.md
@@ -9,7 +9,7 @@ To enable authentication via OpenId Connect refering to [NiFi Administration gui
 In addition and to ensure multiple identity provider support, we recommended to add the following configuration to your `nifi.properties` : 
 
 ```sh
-nifi.security.identity.mapping.pattern.dn=CN=(.*)(?:, (?:O|OU)=.*)?
+nifi.security.identity.mapping.pattern.dn=CN=([^,]*)(?:, (?:O|OU)=.*)?
 nifi.security.identity.mapping.value.dn=$1
 nifi.security.identity.mapping.transform.dn=NONE
 ```
@@ -33,7 +33,7 @@ spec:
         nifi.security.user.oidc.discovery.url=<oidc server discovery url>
         nifi.security.user.oidc.client.id=<oidc client's id>
         nifi.security.user.oidc.client.secret=<oidc client's secret>
-        nifi.security.identity.mapping.pattern.dn=CN=(.*)(?:, (?:O|OU)=.*)?
+        nifi.security.identity.mapping.pattern.dn=CN=([^,]*)(?:, (?:O|OU)=.*)?
         nifi.security.identity.mapping.value.dn=$1
         nifi.security.identity.mapping.transform.dn=NONE
       ...

diff --git a/website/docs/6_contributing/1_developer_guide.md b/website/docs/6_contributing/1_developer_guide.md
@@ -15,7 +15,7 @@ NiFiKop has been validated with :
 - [docker](docker_tool) version 18.09+.
 - [kubectl](kubectl_tool) version v1.13.3+.
 - [Helm](https://helm.sh/) version v2.12.2.
-- [Operator sdk](https://github.com/operator-framework/operator-sdk) version v0.15.0 
+- [Operator sdk](https://github.com/operator-framework/operator-sdk) version v0.18.2 
 
 ### Install the Operator SDK CLI
 
@@ -24,6 +24,9 @@ First, checkout and install the operator-sdk CLI:
 ```bash
 mkdir -p $GOPATH/src/github.com/operator-framework/
 cd $GOPATH/src/github.com/operator-framework/
+git clone https://github.com/operator-framework/operator-sdk.git
+cd operator-sdk
+git checkout v1.18.0
 make tidy
 make install
 ```