From b3b761d1cd0366b615dbdb089fde1e6e226586a3 Mon Sep 17 00:00:00 2001 From: Fabio Rauber Date: Wed, 19 May 2021 14:49:16 -0300 Subject: [PATCH] Setting coe.adaptor is mandatory --- charts/nsx-ncp-operator/v0.1.0/questions.yaml | 10 ++++++++ charts/nsx-ncp-operator/v0.1.0/values.yaml | 24 +++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/charts/nsx-ncp-operator/v0.1.0/questions.yaml b/charts/nsx-ncp-operator/v0.1.0/questions.yaml index 9e47663..a9f496c 100644 --- a/charts/nsx-ncp-operator/v0.1.0/questions.yaml +++ b/charts/nsx-ncp-operator/v0.1.0/questions.yaml @@ -27,6 +27,16 @@ questions: required: true # Cluster options +- variable: ncp.coe.adaptor + default: "kubernetes" + description: "Specify whether you are running on Kubernetes or Openshift." + label: "NCP Adaptor" + type: enum + options: + - kubernetes + - openshift4 + group: Cluster + required: true - variable: ncp.coe.cluster default: "k8scl-one" description: "Kubernetes cluster name for vSphere" diff --git a/charts/nsx-ncp-operator/v0.1.0/values.yaml b/charts/nsx-ncp-operator/v0.1.0/values.yaml index 43b89af..364ee19 100644 --- a/charts/nsx-ncp-operator/v0.1.0/values.yaml +++ b/charts/nsx-ncp-operator/v0.1.0/values.yaml @@ -22,48 +22,48 @@ ncp: # VC API server HTTPS port. https_port: 443 - coe: {} + coe: # Container orchestrator adaptor to plug in. - #adaptor = kubernetes + adaptor: kubernetes # Specify cluster for adaptor. - #cluster = k8scluster + cluster: k8scluster # Log level for NCP modules (controllers, services, etc.). Ignored if debug # is True # Choices: NOTSET DEBUG INFO WARNING ERROR CRITICAL - #loglevel = + #loglevel: # Log level for NSX API client operations. Ignored if debug is True # Choices: NOTSET DEBUG INFO WARNING ERROR CRITICAL - #nsxlib_loglevel = + #nsxlib_loglevel: # Enable SNAT for all projects in this cluster. Modification of topologies # for existing Namespaces is not supported if this option is reset. - #enable_snat = True + #enable_snat: True # Option to enable profiling - #profiling = False + #profiling: False # The interval of reporting performance metrics (0 means disabled) - #metrics_interval = 0 + #metrics_interval: 0 # Name of log file for outputting metrics only (if not defined, use default # logging facility) - #metrics_log_file = + #metrics_log_file: # The type of container host node # Choices: HOSTVM BAREMETAL CLOUD WCP_WORKER - #node_type = HOSTVM + #node_type: HOSTVM # The time in seconds for NCP/nsx_node_agent to recover the connection to # NSX manager/container orchestrator adaptor/Hyperbus before exiting. If # the value is 0, NCP/nsx_node_agent won't exit automatically when the # connection check fails - #connect_retry_timeout = 0 + #connect_retry_timeout: 0 # Enable system health status report for SHA - #enable_sha = True + #enable_sha: True default: {} # If set to true, the logging level will be set to DEBUG instead of the # default INFO level.