diff --git a/charts/airgapped-docs/Chart.yaml b/charts/airgapped-docs/Chart.yaml index 515229b..188d906 100644 --- a/charts/airgapped-docs/Chart.yaml +++ b/charts/airgapped-docs/Chart.yaml @@ -3,5 +3,5 @@ name: airgapped-docs description: Rancher Government Airgapped Docs icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg type: application -version: 0.1.42 -appVersion: "0.1.0" +version: 0.1.43 +appVersion: "0.1.1" diff --git a/charts/airgapped-docs/templates/deployment.yaml b/charts/airgapped-docs/templates/deployment.yaml index 94a8653..499acff 100644 --- a/charts/airgapped-docs/templates/deployment.yaml +++ b/charts/airgapped-docs/templates/deployment.yaml @@ -23,15 +23,13 @@ spec: spec: containers: - name: {{ $key }}-offline-docs - image: {{ template "system_default_registry" . }}{{ $value.image.name }}:{{ $value.image.tag }} + image: {{ template "system_default_registry" . }}{{ $value.image.name }}:{{ $value.image.tag | default .Values.defaults.image.tag }} imagePullPolicy: Always - {{- if $value.uid }} securityContext: - runAsUser: {{ $value.uid }} - {{- end }} + runAsUser: {{ $value.uid | default .Values.defaults.uid }} ports: - name: http - containerPort: 80 + containerPort: {{ $value.containerPort | default .Values.defaults.containerPort }} {{- end }} {{- end -}} {{- end }} \ No newline at end of file diff --git a/charts/airgapped-docs/templates/navlink.yaml b/charts/airgapped-docs/templates/navlink.yaml index 35f6f54..04e222e 100644 --- a/charts/airgapped-docs/templates/navlink.yaml +++ b/charts/airgapped-docs/templates/navlink.yaml @@ -181,26 +181,6 @@ spec: --- -apiVersion: ui.cattle.io/v1 -kind: NavLink -metadata: - name: hauler-offline-docs -spec: - label: TODO Hauler Docs - target: _blank - description: swiss-army tool - group: Airgap-friendly Docs - iconSrc: - label: Hauler Docs - sideLabel: air-gap - toService: - name: hauler-offline-docs - namespace: "{{ .Release.Namespace }}" - port: "80" - scheme: http - ---- - apiVersion: ui.cattle.io/v1 kind: NavLink metadata: diff --git a/charts/airgapped-docs/templates/service.yaml b/charts/airgapped-docs/templates/service.yaml index 1bb0d56..b7c7707 100644 --- a/charts/airgapped-docs/templates/service.yaml +++ b/charts/airgapped-docs/templates/service.yaml @@ -12,7 +12,7 @@ spec: - name: http port: 80 protocol: TCP - targetPort: 80 + targetPort: http selector: app: {{ $key }}-offline-docs {{- end }} diff --git a/charts/airgapped-docs/values.yaml b/charts/airgapped-docs/values.yaml index ff0020b..e460264 100644 --- a/charts/airgapped-docs/values.yaml +++ b/charts/airgapped-docs/values.yaml @@ -5,82 +5,72 @@ global: cattle: systemDefaultRegistry: "rgcrprod.azurecr.us" -images: - carbide: - name: carbide/carbide-docs - tag: 0.1.0 +defaults: + containerPort: 8080 + uid: 65532 + image: + tag: "0.1.1" docs: kubernetes: enabled: true - uid: 65532 image: name: "carbide/kubernetes-cncf-docs" - tag: "0.1.0" + # tag: "0.1.1" rancher: enabled: true - uid: 65532 image: name: "carbide/rancher-docs" - tag: "0.1.0" + # tag: "0.1.1" rke2: enabled: true - uid: 65532 image: name: "carbide/rke2-docs" - tag: "0.1.0" + # tag: "0.1.1" k3s: enabled: true - uid: 65532 image: name: "carbide/k3s-docs" - tag: "0.1.0" + # tag: "0.1.1" neuvector: enabled: true uid: 100 image: name: "carbide/neuvector-docs" - tag: "0.1.0" + # tag: "0.1.1" fleet: enabled: true - uid: 65532 image: name: "carbide/fleet-docs" - tag: "0.1.0" + # tag: "0.1.1" longhorn: enabled: true - uid: 65532 image: name: "carbide/longhorn-docs" - tag: "0.1.0" + # tag: "0.1.1" kubewarden: enabled: true - uid: 65532 image: name: "carbide/kubewarden-docs" - tag: "0.1.0" + # tag: "0.1.1" carbide: enabled: true - uid: 65532 image: name: "carbide/carbide-docs" - tag: "0.1.0" + # tag: "0.1.1" elemental: enabled: true - uid: 65532 image: name: "carbide/elemental-docs" - tag: "0.1.0" + # tag: "0.1.1" harvester: enabled: true - uid: 65532 image: name: "carbide/harvester-docs" - tag: "0.1.0" + # tag: "0.1.1" rancherdesktop: enabled: true - uid: 65532 image: name: "carbide/rancher-desktop-docs" - tag: "0.1.0" + # tag: "0.1.1" diff --git a/charts/heimdall2/Chart.yaml b/charts/heimdall2/Chart.yaml index c4d7ba2..0ddd5d3 100644 --- a/charts/heimdall2/Chart.yaml +++ b/charts/heimdall2/Chart.yaml @@ -3,5 +3,5 @@ name: heimdall2 description: Rancher Government Heimdall2 Tool icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg type: application -version: 0.1.24 -appVersion: "0.1.0" \ No newline at end of file +version: 0.1.29 +appVersion: "0.1.1" diff --git a/charts/heimdall2/values.yaml b/charts/heimdall2/values.yaml index 6d5cd5c..1cbc0ac 100644 --- a/charts/heimdall2/values.yaml +++ b/charts/heimdall2/values.yaml @@ -2,15 +2,15 @@ proxy: imagePullPolicy: IfNotPresent image: name: carbide/heimdall-proxy - tag: "0.1.0" + tag: "0.1.1" port: 8080 service: type: ClusterIP port: 80 postgres: image: - name: carbide/postgres - tag: "13" + name: carbide/heimdall-postgres + tag: "13.1" imagePullPolicy: IfNotPresent port: 5432 service: @@ -49,14 +49,14 @@ heimdall: axios: "" rcidf: # rancher-cluster-id-finder name: carbide/rcidf - tag: "0.1.0" + tag: "0.1.1" databaseName: "heimdall" # repository: mitre/heimdall2 # tag: 2.6.32 image: name: carbide/heimdall2 tag: "0.1.0" - path: 0.1.0 + path: 0.1.1 port: 8080 service: type: ClusterIP diff --git a/charts/stigatron-ui/Chart.yaml b/charts/stigatron-ui/Chart.yaml index 746d529..fb65910 100644 --- a/charts/stigatron-ui/Chart.yaml +++ b/charts/stigatron-ui/Chart.yaml @@ -3,5 +3,5 @@ name: stigatron-ui description: Rancher Government Stigatron UI Extension icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg type: application -version: 0.1.19 -appVersion: "0.3.0" +version: 0.1.20 +appVersion: "0.1.1" diff --git a/charts/stigatron-ui/values.yaml b/charts/stigatron-ui/values.yaml index fb40fa9..1e927ac 100644 --- a/charts/stigatron-ui/values.yaml +++ b/charts/stigatron-ui/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 UIPluginNamespace: cattle-ui-plugin-system image: pullPolicy: Always - tag: "0.1.0" + tag: "0.1.1" name: carbide/stigatron-ui imagePullSecrets: [] nameOverride: "" diff --git a/charts/stigatron/Chart.yaml b/charts/stigatron/Chart.yaml index 4a9466f..899682d 100644 --- a/charts/stigatron/Chart.yaml +++ b/charts/stigatron/Chart.yaml @@ -3,7 +3,7 @@ name: stigatron description: Rancher Government Stigatron Extension icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg type: application -version: 0.1.39 +version: 0.1.40 appVersion: "0.1.0" dependencies: - name: heimdall2 diff --git a/charts/stigatron/values.yaml b/charts/stigatron/values.yaml index d2b565d..3b60424 100644 --- a/charts/stigatron/values.yaml +++ b/charts/stigatron/values.yaml @@ -1,7 +1,7 @@ complianceOperator: image: name: carbide/compliance-operator - tag: "0.1.0" + tag: "0.1.1" imagePullPolicy: Always serviceAccountName: stigatron heimdallOperator: