Skip to content

Commit

Permalink
OPS 5666 integrate sshd users into present users (#2)
Browse files Browse the repository at this point in the history
* move chart into named chart folder and rename sc-sshd to infra-sshd for generelization
* Change GHA to run on tag push and use specified tag as image-tag,
* Add a kics scan on every push
* change suggested namespace from service to sshd-service
  • Loading branch information
JannikBadenhop authored Feb 6, 2024
1 parent b3bda8c commit 1ebe0fd
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 25 deletions.
22 changes: 6 additions & 16 deletions .github/workflows/chart-release-manual.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
name: Push Charts to helm-charts-registry manually with specified version
name: Push Charts to helm-charts-registry

on:
workflow_dispatch:
inputs:
chart_version:
type: string
description: "Chart version"
required: true
image_tag:
type: string
description: "image tag"
required: true
push:
tags:
- "[0-9]+.[0-9]+.[0-9]+"

concurrency:
group: infra-sshd-chart-manual
group: infra-sshd-chart
cancel-in-progress: true

jobs:
Expand All @@ -26,8 +19,5 @@ jobs:
uses: dBildungsplattform/dbp-github-workflows/.github/workflows/[email protected]
secrets: inherit
with:
chart_path: .
chart_name: infra-sshd
helm_chart_version_generation: specified
image_tag_generation: specified
helm_chart_version: ${{ inputs.chart_version }}
image_tag: ${{ inputs.image_tag }}
14 changes: 14 additions & 0 deletions .github/workflows/scan-helm-on-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Scan Helm on push"

on:
push:

concurrency:
group: infra-sshd-scan-helm-${{ github.event.ref }}
cancel-in-progress: true

jobs:
scan_helm:
uses: dBildungsplattform/dbp-github-workflows/.github/workflows/[email protected]
permissions:
contents: read
23 changes: 23 additions & 0 deletions infra-sshd/.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/
6 changes: 3 additions & 3 deletions Chart.yaml → infra-sshd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: sc-sshd
name: infra-sshd
description: A Helm chart for Kubernetes

# A chart can be either an 'application' or a 'library' chart.
Expand All @@ -15,9 +15,9 @@ 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: 0.1.1
version: 0.1.2

# 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.
appVersion: 1.0.0
appVersion: 1.0.1
10 changes: 5 additions & 5 deletions README.md → infra-sshd/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SSHD
# INFRA-SSHD
A bastion host (also jump server or jump service) is usually set up as a single entrypoint into a privat system. In IONOS' case, a SSH daemon grants access to a DMZ which contains PostgreSQL and MongoDB databases.

## TL;DR;
```
$ helm upgrade sc-sshd ./sc-sshd --install --create-namespace -n sc-service
$ helm upgrade infra-sshd ./infra-sshd --install --create-namespace -n sshd-service
```

## Introduction
Expand All @@ -20,12 +20,12 @@ This chart can be installed in two flavors:
## Installing the chart
Prior to installing, please update the authorized keys file. This file is used to create a configmap which eventually tells the daemon which keys to grant access. Currently, only a "support" user is configured in the image. For scalability reasons, authorized key files are separated by users, e.g. user support: support_authorized_keys.
```
$ helm upgrade sc-sshd ./sc-sshd --install --create-namespace -n sc-service
$ helm upgrade infra-sshd ./infra-sshd --install --create-namespace -n sshd-service
```

## Uninstalling the chart
```
$ helm -n sc-service delete sc-sshd
$ helm -n sshd-service delete infra-sshd
```

## Parameters
Expand All @@ -36,7 +36,7 @@ These parameters can be set:
| replicaCount | Count of pods that will be created as part of the deployment | 1 |
| image.repository | Repository the image will be pulled from | schulcloud/infra-sshd |
| image.tag | Image tag which will be used | stable |
| ingress.standalone | Specifies whether SSHD is deployed behind HAProxy or standalone | false |
| ingress.standalone | Specifies whether INFRA-SSHD is deployed behind HAProxy or standalone | false |

## Authorized keys
Currently supported users and key files:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion values.yaml → infra-sshd/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Default values for sc-sshd.
# Default values for infra-sshd.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

Expand Down

0 comments on commit 1ebe0fd

Please sign in to comment.