Merge branch 'gluon-fix' into 'main'

chore: fix source for gluon

Closes #10

See merge request big-bang/apps/sandbox/podinfo!49

CHANGELOG.md

@@ -3,6 +3,10 @@
 > Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ---
+## [6.0.0-bb.8] - 2023-09-07
+### Changed
+- Update gluon to pull from registry1
+
 ## [6.0.0-bb.7] - 2023-01-12
 ### Changed
 - Update image to pull from ghcr.io

README.md

 # podinfo
 
-![Version: 6.0.0-bb.7](https://img.shields.io/badge/Version-6.0.0--bb.7-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
+![Version: 6.0.0-bb.8](https://img.shields.io/badge/Version-6.0.0--bb.8-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
 
 Podinfo Helm chart for Kubernetes
 

bigbang/templates/_helpers.tpl

-{{- define "imagePullSecret" }}
-  {{- if .Values.registryCredentials -}}
-    {{- $credType := typeOf .Values.registryCredentials -}}
-          {{- /* If we have a list, embed that here directly. This allows for complex configuration from configmap, downward API, etc. */ -}}
-    {{- if eq $credType "[]interface {}" -}}
-    {{- include "multipleCreds" . | b64enc }}
-    {{- else if eq $credType "map[string]interface {}" }}
-      {{- /* If we have a map, treat those as key-value pairs. */ -}}
-      {{- if and .Values.registryCredentials.username .Values.registryCredentials.password }}
-      {{- with .Values.registryCredentials }}
-      {{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }}
-      {{- end }}
-      {{- end }}
-    {{- end -}}
-  {{- end }}
-{{- end }}
-
-{{- define "multipleCreds" -}}
-{
-  "auths": {
-    {{- range $i, $m := .Values.registryCredentials }}
-    {{- /* Only create entry if resulting entry is valid */}}
-    {{- if and $m.registry $m.username $m.password }}
-    {{- if $i }},{{ end }}
-    "{{ $m.registry }}": {
-      "username": "{{ $m.username }}",
-      "password": "{{ $m.password }}",
-      "email": "{{ $m.email | default "" }}",
-      "auth": "{{ printf "%s:%s" $m.username $m.password | b64enc }}"
-    }
-    {{- end }}
-    {{- end }}
-  }
-}
-{{- end }}
-
-{{/*
-Build the appropriate spec.ref.{} given git branch, commit values
-*/}}
-{{- define "validRef" -}}
-{{- if .commit -}}
-{{- if not .branch -}}
-{{- fail "A valid branch is required when a commit is specified!" -}}
-{{- end -}}
-branch: {{ .branch | quote }}
-commit: {{ .commit }}
-{{- else if .semver -}}
-semver: {{ .semver | quote }}
-{{- else if .tag -}}
-tag: {{ .tag }}
-{{- else -}}
-branch: {{ .branch | quote }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Build the appropriate git credentials secret for private git repositories
-*/}}
-{{- define "gitCreds" -}}
-{{- if .Values.git.existingSecret -}}
-secretRef:
-  name: {{ .Values.git.existingSecret }}
-{{- else if coalesce .Values.git.credentials.username .Values.git.credentials.password .Values.git.credentials.caFile .Values.git.credentials.privateKey .Values.git.credentials.publicKey .Values.git.credentials.knownHosts "" -}}
-{{- /* Input validation happens in git-credentials.yaml template */ -}}
-secretRef:
-  name: {{ $.Release.Name }}-git-credentials
-{{- end -}}
-{{- end -}}
-
-{{/*
-Build common set of file extensions to include/exclude
-*/}}
-{{- define "gitIgnore" -}}
-  ignore: |
-    # exclude file extensions
-    /**/*.md
-    /**/*.txt
-    /**/*.sh
-    !/chart/tests/scripts/*.sh
-{{- end -}}
-
-{{/*
-Common labels for all objects
-*/}}
-{{- define "commonLabels" -}}
-app.kubernetes.io/instance: "{{ .Release.Name }}"
-app.kubernetes.io/version: "{{ .Chart.Version }}"
-app.kubernetes.io/part-of: "bigbang"
-app.kubernetes.io/managed-by: "flux"
-{{- end -}}
-
-{{- define "values-secret" -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .root.Release.Name }}-{{ .name }}-values
-  namespace: {{ .root.Release.Namespace }}
-type: generic
-stringData:
-  common: |
-  defaults: {{- toYaml .defaults | nindent 4 }}
-  overlays: |
-    {{- toYaml .package.values | nindent 4 }}
-{{- end -}}
-
-{{/* 
-bigbang.addValueIfSet can be used to nil check parameters before adding them to the values.
-  Expects a list with the following params:
-    * [0] - (string) <yaml_key_to_add>
-    * [1] - (interface{}) <value_to_check>
-  
-  No output is generated if <value> is undefined, however, explicitly set empty values 
-  (i.e. `username=""`) will be passed along. All string fields will be quoted.
-
-  Example command: 
-  - `{{ (list "name" .username) | include "bigbang.addValueIfSet" }}`
-    * When `username: Aniken`
-      -> `name: "Aniken"`
-    * When `username: ""`
-      -> `name: ""`
-    * When username is not defined
-      -> no output 
-*/}}
-{{- define "bigbang.addValueIfSet" -}}
-  {{- $key := (index . 0) }}
-  {{- $value := (index . 1) }}
-  {{- /*If the value is explicitly set (even if it's empty)*/}}
-  {{- if not (kindIs "invalid" $value) }}
-    {{- /*Handle strings*/}}
-    {{- if kindIs "string" $value }}
-      {{- printf "\n%s" $key }}: {{ $value | quote }} 
-    {{- /*Hanldle slices*/}}
-    {{- else if kindIs "slice" $value }}
-      {{- printf "\n%s" $key }}:    
-        {{- range $value }}
-          {{- if kindIs "string" . }}
-            {{- printf "\n  - %s" (. | quote) }}
-          {{- else }} 
-            {{- printf "\n  - %v" . }}
-          {{- end }}
-        {{- end }}
-    {{- /*Handle other types (no quotes)*/}}
-    {{- else }}
-      {{- printf "\n%s" $key }}: {{ $value }} 
-    {{- end }}
-  {{- end }}
-{{- end -}}
-
-{{/*
-Annotation for Istio version
-*/}}
-{{- define "istioAnnotation" -}}
-{{- if .Values.istio.git.semver -}}
-bigbang.dev/istioVersion: {{ .Values.istio.git.semver | trimSuffix (regexFind "-bb.*" .Values.istio.git.semver) }}
-{{- else if .Values.istio.git.tag -}}
-bigbang.dev/istioVersion: {{ .Values.istio.git.tag | trimSuffix (regexFind "-bb.*" .Values.istio.git.tag) }}
-{{- else if .Values.istio.git.branch -}}
-bigbang.dev/istioVersion: {{ .Values.istio.git.branch }}
-{{- end -}}
-{{- end -}}

bigbang/values.yaml

@@ -37,6 +37,17 @@ gatekeeper:
 kyverno:
   enabled: false
 
+kyvernoPolicies:
+  enabled: false
+
+kyvernoReporter:
+  enabled: false
+
+grafana:
+  enabled: false
+
+neuvector:
+  enabled: false
 tempo:
   enabled: false
 
@@ -46,10 +57,10 @@ promtail:
 loki:
   enabled: false
 
-eckoperator:
+eckOperator:
   enabled: false
 
-logging:
+elasticsearchKibana:
   enabled: false
 
 fluentbit:
@@ -79,7 +90,7 @@ addons:
     enabled: false
   minio:
     enabled: false
-  mattermostoperator:
+  mattermostOperator:
     enabled: false
   mattermost:
     enabled: false

chart/Chart.yaml

 apiVersion: v1
-version: 6.0.0-bb.7
+version: 6.0.0-bb.8
 appVersion: 6.0.0
 name: podinfo
 engine: gotpl
@@ -14,4 +14,4 @@ kubeVersion: ">=1.19.0-0"
 dependencies:
 - name: gluon
   version: "0.2.10"
-  repository: "oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon"
+  repository: "oci://registry1.dso.mil/bigbang"

chart/requirements.lock

 dependencies:
 - name: gluon
-  repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
+  repository: oci://registry1.dso.mil/bigbang
   version: 0.2.10
-digest: sha256:10de93396e275c5f10a0919340e333b9e4b011f2fc63a5b43c9e91e49800d8bc
-generated: "2022-06-28T12:41:30.054039-06:00"
+digest: sha256:78587eca091164752360329a07d1a974528f8c18a0e8f1fdd2620d8c7fc90bf2
+generated: "2023-09-07T14:30:23.697463-06:00"