Fix helm chart artifact hub enabled property (#4680)

- value of false always defaults to true - flip to disabled, rather than enabled - also fix property names
cloudfoundry · Oct 14, 2020 · 7f6cd53 · 7f6cd53
1 parent 53b2169
commit 7f6cd53
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -302,8 +302,8 @@ spec:
           value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
         - name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
           value: "{{.Values.console.kubeDashboardImage}}"        
-        - name: ARTIFACT_HUB_ENABLED
-          value: {{ default "true" .Values.console.artifactHubEnabled | quote }}
+        - name: ARTIFACT_HUB_DISABLED
+          value: {{ default "false" .Values.console.artifactHubDisabled | quote }}
         {{- include "stratosJetstreamEnv" . | indent 8 }}
         readinessProbe:
           httpGet:

diff --git a/src/frontend/packages/kubernetes/src/helm/helm-entity-generator.ts b/src/frontend/packages/kubernetes/src/helm/helm-entity-generator.ts
@@ -90,7 +90,7 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
         registrationComponent: HelmHubRegistrationComponent,
         registeredLimit: (store: Store<AppState>): Observable<number> => store.select('auth').pipe(
           filter(auth => !!auth.sessionData['plugin-config']),
-          map(auth => auth.sessionData['plugin-config'].helmHubEnabled === 'true' ? 1 : 0),
+          map(auth => auth.sessionData['plugin-config'].artifactHubDisabled === 'true' ? 0 : 1),
         )
       },
     ],

diff --git a/src/jetstream/config.example b/src/jetstream/config.example
@@ -79,4 +79,4 @@ INVITE_USER_CLIENT_SECRET=
 # HELM_CACHE_FOLDER=./helm-cache
 
 # Enabled Artifact Hub
-# ARTIFACT_HUB_ENABLED=false
+# ARTIFACT_HUB_DISABLED=false
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
@@ -14,15 +14,15 @@ import (
 )
 
 const (
-	helmEndpointType      = "helm"
-	helmHubEndpointType   = "hub"
-	helmRepoEndpointType  = "repo"
-	stratosPrefix         = "/pp/v1/"
-	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
-	cacheFolderEnvVar     = "HELM_CACHE_FOLDER"
-	defaultCacheFolder    = "./.helm-cache"
-	helmHubEnabledEnvVar  = "ARTIFACT_HUB_ENABLED"
-	helmHubEnabled        = "helmHubEnabled"
+	helmEndpointType          = "helm"
+	helmHubEndpointType       = "hub"
+	helmRepoEndpointType      = "repo"
+	stratosPrefix             = "/pp/v1/"
+	kubeReleaseNameEnvVar     = "STRATOS_HELM_RELEASE"
+	cacheFolderEnvVar         = "HELM_CACHE_FOLDER"
+	defaultCacheFolder        = "./.helm-cache"
+	artifactHubDisabledEnvVar = "ARTIFACT_HUB_DISABLED"
+	artifactHubDisabled       = "artifactHubDisabled"
 )
 
 // Monocular is a plugin for Monocular
@@ -59,10 +59,10 @@ func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error)
 func (m *Monocular) Init() error {
 	log.Debug("Monocular init .... ")
 
-	if val, ok := m.portalProxy.Env().Lookup(helmHubEnabledEnvVar); ok {
-		m.portalProxy.GetConfig().PluginConfig[helmHubEnabled] = val
+	if val, ok := m.portalProxy.Env().Lookup(artifactHubDisabledEnvVar); ok {
+		m.portalProxy.GetConfig().PluginConfig[artifactHubDisabled] = val
 	} else {
-		m.portalProxy.GetConfig().PluginConfig[helmHubEnabled] = "true"
+		m.portalProxy.GetConfig().PluginConfig[artifactHubDisabled] = "false"
 	}
 
 	m.CacheFolder = m.portalProxy.Env().String(cacheFolderEnvVar, defaultCacheFolder)
@@ -246,7 +246,7 @@ func (m *Monocular) validateExternalMonocularEndpoint(cnsi string) (*interfaces.
 		return &endpoint, nil
 	}
 
-	if m.portalProxy.GetConfig().PluginConfig[helmHubEnabled] != "true" {
+	if m.portalProxy.GetConfig().PluginConfig[artifactHubDisabled] != "true" {
 		return nil, echo.NewHTTPError(http.StatusInternalServerError, errors.New("Artifact Hub is disabled"))
 	}