diff --git a/.github/linter/jscpd/jscpd.json b/.github/linter/jscpd/jscpd.json index f1dac44ab..f472beae7 100644 --- a/.github/linter/jscpd/jscpd.json +++ b/.github/linter/jscpd/jscpd.json @@ -6,6 +6,7 @@ "console" ], "ignore": [ + ".disabled/**", "**/node_modules/**", "**/.git/**", "**/.direnv/**", @@ -19,8 +20,7 @@ "**/*.yml", "**/*.md", "**/*.html", - "**/*.xml", - "kubernetes/**/scripts/pushover-notify.sh" + "**/*.xml" ] } \ No newline at end of file diff --git a/.github/linter/yamllint/.yamllint.yaml b/.github/linter/yamllint/.yamllint.yaml index bb7b058db..79e9f0a2c 100644 --- a/.github/linter/yamllint/.yamllint.yaml +++ b/.github/linter/yamllint/.yamllint.yaml @@ -1,5 +1,6 @@ --- ignore: | + .disabled/ .ansible/ .direnv/ .private/ diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index dcb682cd3..6337b3566 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -5,7 +5,7 @@ on: # yamllint disable-line rule:truthy workflow_dispatch: pull_request: branches: - - main + - master concurrency: group: ${{ github.ref }}-${{ github.workflow }} @@ -40,7 +40,6 @@ jobs: "KUBERNETES_KUBESCAPE", "MARKDOWN_MARKDOWNLINT", "REPOSITORY_GIT_DIFF", - "REPOSITORY_SECRETLINT", "YAML_PRETTIER", "YAML_YAMLLINT" ] @@ -50,8 +49,8 @@ jobs: }} COPYPASTE_JSCPD_CONFIG_FILE: .github/linter/jscpd/jscpd.json KUBERNETES_DIRECTORY: '' - KUBERNETES_KUBEVAL_ARGUMENTS: --ignore-missing-schemas - KUBERNETES_KUBEVAL_FILTER_REGEX_INCLUDE: "(kubernetes)" + KUBERNETES_KUBECONFORM_ARGUMENTS: --ignore-missing-schemas + KUBERNETES_KUBECONFORM_FILTER_REGEX_EXCLUDE: "(Chart.yaml|values.yaml)" MARKDOWN_MARKDOWNLINT_CONFIG_FILE: .github/linter/markdownlint/markdownlint.yaml YAML_YAMLLINT_CONFIG_FILE: .github/linter/yamllint/.yamllint.yaml YAML_PRETTIER_CONFIG_FILE: .github/linter/prettier/.prettierrc.yaml diff --git a/apps-root-config/applications/cluster-rpg-apps.yaml b/apps-root-config/applications/cluster-rpg-apps.yaml new file mode 100644 index 000000000..187430a39 --- /dev/null +++ b/apps-root-config/applications/cluster-rpg-apps.yaml @@ -0,0 +1,28 @@ +--- +repository: https://github.com/mikevader/k3s-cluster-infra-apps.git +# argocdNamespace: "argocd" +# server: "https://kubernetes.default.svc" +subFolder: cluster-rpg-apps +namespace: + annotations: {} + labels: + client: cluster-infra + +enableDefaultNetworkPolicy: false +enableDefaultLimitRange: false +allowAllNamespaces: true + +roleBindings: +# - groupName: "team1" +# clusterRoleName: "admin" + +clusterResourceWhitelist: + - group: '*' + kind: '*' + +namespaceResourceBlacklist: +# - group: 'apps' +# kind: 'DaemonSet' + +applications: + dmw: {} diff --git a/apps-root-config/bootstrap/values.yaml b/apps-root-config/bootstrap/values.yaml index da3f155a4..5d69472f9 100644 --- a/apps-root-config/bootstrap/values.yaml +++ b/apps-root-config/bootstrap/values.yaml @@ -1,9 +1,11 @@ +--- repository: https://github.com/mikevader/k3s-cluster-infra-apps.git bootstrap: - name: cluster-init-apps -# argocdNamespace: asdfasdf + # argocdNamespace: asdfasdf - name: cluster-critical-apps - name: cluster-platform-apps - name: cluster-utility-apps - name: cluster-media-apps + - name: cluster-rpg-apps - name: cluster-test diff --git a/cluster-rpg-apps/dmw/Chart.yaml b/cluster-rpg-apps/dmw/Chart.yaml new file mode 100644 index 000000000..dccc30d43 --- /dev/null +++ b/cluster-rpg-apps/dmw/Chart.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v2 +name: dmw +description: Dungeon Master Workshop app +version: 1.0.0 +dependencies: + - name: dmw + repository: https://mikevader.github.io/dm-workshop + version: 1.0.0-dev.4c36ba3 diff --git a/cluster-rpg-apps/dmw/values.yaml b/cluster-rpg-apps/dmw/values.yaml new file mode 100644 index 000000000..9fe0780fe --- /dev/null +++ b/cluster-rpg-apps/dmw/values.yaml @@ -0,0 +1,27 @@ +--- +dmw: + railsEnvironment: development + + ingress: + enabled: true + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.entrypoints: websecure + # traefik.ingress.kubernetes.io/router.middlewares: authentik-authentik@kubernetescrd + hosts: + - host: 'dmw.framsburg.ch' + paths: + - path: / + pathType: Prefix + tls: + - hosts: ['dmw.framsburg.ch'] + secretName: 'dmw-framsburg-ch-tls' + + env: + - name: SERVER_HOST_NAME + value: 'dmw.framsburg.ch' + +# podSecurityContext: +# sysctls: +# - name: fs.inotify.max_user_instances +# value: "256"