Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.1.30 #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chart/values.yaml.bak
1 change: 1 addition & 0 deletions .helmignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.git
.gitignore
7 changes: 5 additions & 2 deletions chart/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ dependencies:
- name: vulns-db
repository: file://deps/vulns-db/
version: 1.1.0
- name: fileupload
repository: file://deps/fileupload/
version: 1.1.0
- name: fluent-bit
repository: file://deps/fluent-bit/
version: 1.1.0
digest: sha256:9e0149830c207203f5166adbad59e50a064565d46d65350c51e57e1c631e4f17
generated: "2023-03-29T10:44:05.524537089-07:00"
digest: sha256:806975bd41d60063b6ef28c441cdd377e2dce2d22daf72123c2969314e229484
generated: "2023-05-01T10:07:21.238653-07:00"
10 changes: 7 additions & 3 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.26
version: 1.1.31

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: 1.1.26
appVersion: 1.1.31
dependencies:
- repository: "file://deps/backend/"
version: 1.1.0
Expand Down Expand Up @@ -71,7 +71,11 @@ dependencies:
version: 1.1.0
name: vulns-db
condition: vulns-db.enabled
- repository: "file://deps/fileupload/"
version: 1.1.0
name: fileupload
condition: fileupload.enabled
- repository: "file://deps/fluent-bit/"
version: 1.1.0
name: fluent-bit
condition: logger.enabled
condition: logger.enabled
Binary file modified chart/charts/aggregator-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/backend-1.1.0.tgz
Binary file not shown.
Binary file added chart/charts/fileupload-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/fluent-bit-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/frontrow-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/iso-master-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/keycloak-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/mysql-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/redis-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/rf-scan-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/rfapi-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/rfpubsub-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/runner-1.1.0.tgz
Binary file not shown.
Binary file modified chart/charts/vulns-db-1.1.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion chart/deps/aggregator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: 1.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.1.26-rfhardened"
appVersion: "1.1.0"
2 changes: 2 additions & 0 deletions chart/deps/aggregator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ spec:
value: "{{ .Values.env.rf_api_server }}"
- name: "REDIS_HOST_NAME"
value: "{{ .Values.env.redis_host }}"
- name: RF_DEBUG
value: "{{ .Values.env.rf_debug }}"
#inject create values as env variable.
{{ if .Values.secret.name }}
{{- $secretName := .Values.secret.name }}
Expand Down
2 changes: 1 addition & 1 deletion chart/deps/backend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ type: application
version: 1.1.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: "1.1.26-rfhardened"
appVersion: "1.1.0"
23 changes: 23 additions & 0 deletions chart/deps/fileupload/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
18 changes: 18 additions & 0 deletions chart/deps/fileupload/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: v2
name: fileupload
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 1.1.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: "1.1.0"
21 changes: 21 additions & 0 deletions chart/deps/fileupload/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "backend.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "backend.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "backend.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "backend.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}
63 changes: 63 additions & 0 deletions chart/deps/fileupload/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "fileupload.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "fileupload.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "fileupload.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Common labels
*/}}
{{- define "fileupload.labels" -}}
helm.sh/chart: {{ include "fileupload.chart" . }}
{{ include "fileupload.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}

{{/*
Selector labels
*/}}
{{- define "fileupload.selectorLabels" -}}
app.kubernetes.io/name: {{ include "fileupload.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{/*
Create the name of the service account to use
*/}}
{{- define "fileupload.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "fileupload.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}
86 changes: 86 additions & 0 deletions chart/deps/fileupload/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "fileupload.fullname" . }}
labels:
{{- include "fileupload.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "fileupload.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
{{- include "fileupload.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "fileupload.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
volumes:
{{- if .Values.volumes }}
{{- tpl (toYaml (index .Values.volumes )) . | nindent 6 }}
{{- end }}
{{- if .Values.extraVolumes }}
{{- tpl (toYaml (index .Values.extraVolumes )) . | nindent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.container.extra_options }}
{{- toYaml .Values.container.extra_options | nindent 10 }}
{{- end }}
env:
- name: LC_ALL
value: "en_US.UTF-8"
- name: FILEUPLOAD_APP_PORT
value: "{{ .Values.service.container_port }}"
- name: RF_DEBUG
value: "{{ .Values.env.rf_debug }}"
{{- if .Values.secret.name }}
{{- $secretName := .Values.secret.name }}
{{- range .Values.secret.keys }}
- name: {{ . | quote}}
valueFrom:
secretKeyRef:
name: {{ $secretName }}
key: {{ . | quote}}
{{- end }}
{{- end }}
volumeMounts:
{{- if .Values.volumeMounts }}
{{- tpl (toYaml (index .Values.volumeMounts )) . | nindent 12 }}
{{- end }}
{{- if .Values.extraVolumeMounts }}
{{- tpl (toYaml (index .Values.extraVolumeMounts )) . | nindent 12 }}
{{- end }}
ports:
- name: fileupload-http
containerPort: {{ .Values.service.container_port }}
protocol: TCP
livenessProbe:
{{- toYaml .Values.livenessProbe | nindent 12 }}
{{- toYaml .Values.probeCommand | nindent 12 }}
readinessProbe:
{{- toYaml .Values.readinessProbe | nindent 12 }}
{{- toYaml .Values.probeCommand | nindent 12 }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
32 changes: 32 additions & 0 deletions chart/deps/fileupload/templates/hpa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{{- if .Values.autoscaling.enabled }}
apiVersion: autoscaling/v2beta2
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "fileupload.fullname" . }}
labels:
{{- include "fileupload.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ include "fileupload.fullname" . }}
minReplicas: {{ .Values.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
metrics:
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource
resource:
name: cpu
target:
type: "Utilization"
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
{{- end }}
# {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
# - type: Resource
# resource:
# name: memory
# target:
# type: "Utilization"
# averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
# {{- end }}
{{- end }}
51 changes: 51 additions & 0 deletions chart/deps/fileupload/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "fileupload.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- $rf_host := .Values.global.rf_app_host }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "fileupload.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ default .Values.ingress.className .Values.global.ingressClassName }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- http:
paths:
{{- range .paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
backend:
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- end }}
# {{ if $rf_host }}
# host: {{ $rf_host | quote }}
# {{ else if .host }}
# host: {{ .host | quote }}
# {{ end }}
{{ if .host }}
host: {{ .host | quote }}
{{ else if $rf_host }}
host: {{ $rf_host | quote }}
{{ end }}
{{- end }}
{{- end }}
19 changes: 19 additions & 0 deletions chart/deps/fileupload/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "fileupload.fullname" . }}
labels:
{{- include "fileupload.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: fileupload-http
protocol: TCP
name: http
- port: 8000
targetPort: fileupload-http
protocol: TCP
name: http8000
selector:
{{- include "fileupload.selectorLabels" . | nindent 4 }}
Loading