From 65671ad436c3ea0f9b93f269583a4e98288e9e3a Mon Sep 17 00:00:00 2001 From: Alexandre Guitton Date: Tue, 23 Nov 2021 12:33:10 +0100 Subject: [PATCH] Hotfix description (#163) * 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 * add sensitive field for parameter type * support empty value update * append changelog & bump version * append changelog & bump version * fix test * fix description requirement * move helm chart bucket location --- .circleci/config.yml | 2 +- api/v1alpha1/nifiparametercontext_types.go | 2 +- config/crd/bases/nifi.orange.com_nifiparametercontexts.yaml | 1 + helm/nifikop/crds/nifi.orange.com_nifiparametercontexts.yaml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7a3e8c22..ac815cb6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -214,7 +214,7 @@ orbs: if [[ $(echo "$CIRCLE_BRANCH" | grep -c "pull") -gt 0 ]]; then echo "This is a PR, we don't publish to helm repo." else - CHART_VERSION=$(cat helm/nifikop/Chart.yaml| grep version | awk -F"version: " '{print $2}') GCP_SA_CREDS=${GCP_POC_RTC_SA_KEY} /home/circleci/nifikop/tools/publish_helm_gcs.sh + CHART_VERSION=$(cat helm/nifikop/Chart.yaml| grep version | awk -F"version: " '{print $2}') GCP_SA_CREDS=${GCP_SQUIDFLOW_SBX_SA_KEY} /home/circleci/nifikop/tools/publish_helm_gcs.sh fi jobs: deploy-website: diff --git a/api/v1alpha1/nifiparametercontext_types.go b/api/v1alpha1/nifiparametercontext_types.go index 2d04d69c0..565c682c0 100644 --- a/api/v1alpha1/nifiparametercontext_types.go +++ b/api/v1alpha1/nifiparametercontext_types.go @@ -41,7 +41,7 @@ type Parameter struct { // the value of the Parameter. Value *string `json:"value,omitempty"` // the description of the Parameter. - Description string `json:"description,omitempty"` + Description string `json:"description"` // Whether the parameter is sensitive or not. Sensitive bool `json:"sensitive,omitempty"` } diff --git a/config/crd/bases/nifi.orange.com_nifiparametercontexts.yaml b/config/crd/bases/nifi.orange.com_nifiparametercontexts.yaml index 5e090110a..98fd0ea43 100644 --- a/config/crd/bases/nifi.orange.com_nifiparametercontexts.yaml +++ b/config/crd/bases/nifi.orange.com_nifiparametercontexts.yaml @@ -68,6 +68,7 @@ spec: description: the value of the Parameter. type: string required: + - description - name type: object type: array diff --git a/helm/nifikop/crds/nifi.orange.com_nifiparametercontexts.yaml b/helm/nifikop/crds/nifi.orange.com_nifiparametercontexts.yaml index 5e090110a..98fd0ea43 100644 --- a/helm/nifikop/crds/nifi.orange.com_nifiparametercontexts.yaml +++ b/helm/nifikop/crds/nifi.orange.com_nifiparametercontexts.yaml @@ -68,6 +68,7 @@ spec: description: the value of the Parameter. type: string required: + - description - name type: object type: array