Merge branch 'master' of github.com:romnnn/marina

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.11
+current_version = 0.0.15
 commit = True
 tag = True
 

.github/workflows/lint.yml

@@ -0,0 +1,10 @@
+name: lint
+on: [push]
+
+jobs:
+  lint-chart:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint helm chart
+        run: helm lint charts/marina/

.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: release
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish-chart:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Lint helm chart
+        run: helm lint charts/marina/
+
+      - run: |
+          echo "repo_user=$(echo ${GITHUB_REPOSITORY} | awk -F / '{print $1}' )" >> $GITHUB_ENV
+          echo "repo_name=$(echo ${GITHUB_REPOSITORY} | awk -F / '{print $2}' )" >> $GITHUB_ENV
+
+      - name: Package helm chart
+        run: |
+          touch ./public/.nojekyll
+          charts/marina/add-repos.sh
+          helm package --dependency-update --destination ./public/charts charts/marina
+          helm repo index --url https://${{ env.repo_user }}.github.io/${{ env.repo_name }}/charts ./public/charts
+
+      - name: Deploy to pages
+        uses: JamesIves/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: public
+          CLEAN: true

DEPLOYMENT.md

@@ -26,7 +26,7 @@ Let's get started!
     export OUT="/tmp/ansible-playbook-istio-helm-k8s"
 
     # download the playbook from the github master branch
-    git clone -b master --single-branch --depth 1 [email protected]:romnnn/ansible-playbook-istio-helm-k8s.git ${OUT}
+    git clone -b master --single-branch --depth 1 [email protected]:romnn/ansible-playbook-istio-helm-k8s.git ${OUT}
 
     # write a ansible inventory file "hosts"
     # this file tells ansible the IP of the server
@@ -85,11 +85,11 @@ Let's get started!
     ```bash
     helm repo add stable https://kubernetes-charts.storage.googleapis.com/
     helm repo add harbor https://helm.goharbor.io
-    helm repo add ldapmanager https://romnnn.github.io/ldap-manager/charts
+    helm repo add ldapmanager https://romnn.github.io/ldap-manager/charts
     helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
     helm repo add bitnami https://charts.bitnami.com/bitnami
     helm repo add jetstack https://charts.jetstack.io
-    helm repo add marina https://romnnn.github.io/marina/charts
+    helm repo add marina https://romnn.github.io/marina/charts
     ```
 
 6. Install MetalLB to the cluster.
@@ -288,4 +288,4 @@ Let's get started!
         --set "harbor.persistence.persistentVolumeClaim.redis.storageClass=nfsc" \
         --set "harbor.persistence.persistentVolumeClaim.trivy.storageClass=nfsc" \
         marina/marina
-    ```
+    ```

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020, romnnn
+Copyright (c) 2020, romnn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,8 @@
 ## marina
 
-[![Build Status](https://travis-ci.com/romnnn/marina.svg?branch=master)](https://travis-ci.com/romnnn/marina)
-[![GitHub](https://img.shields.io/github/license/romnnn/marina)](https://github.com/romnnn/marina)
-[![Release](https://img.shields.io/github/release/romnnn/marina)](https://github.com/romnnn/marina/releases/latest)
+[![Build Status](https://github.com/romnn/marina/workflows/lint/badge.svg)](https://github.com/romnn/marina/actions)
+[![GitHub](https://img.shields.io/github/license/romnn/marina)](https://github.com/romnn/marina)
+[![Release](https://img.shields.io/github/release/romnn/marina)](https://github.com/romnn/marina/releases/latest)
 
 <p align="center">
   <img width="100" src="public/icons/icon_lg.jpg">
@@ -16,8 +16,8 @@ Add the following helm repositories that `marina` depends on:
 ```bash
 helm repo add stable https://kubernetes-charts.storage.googleapis.com/
 helm repo add harbor https://helm.goharbor.io
-helm repo add ldap-manager https://romnnn.github.io/ldap-manager/charts
-helm repo add marina https://romnnn.github.io/marina/charts
+helm repo add ldap-manager https://romnn.github.io/ldap-manager/charts
+helm repo add marina https://romnn.github.io/marina/charts
 ```
 
 For a quickstart installation, edit and save this minimal configuration as `override.yaml`:
@@ -88,4 +88,4 @@ See [this guide](./DEPLOYMENT.md) on how to install marina in a bare-metal kuber
 
 #### Other open source solutions
 
-TODO
+TODO

charts/marina/Chart.lock

@@ -3,7 +3,7 @@ dependencies:
   repository: https://helm.goharbor.io
   version: 1.4.2
 - name: ldapmanager
-  repository: https://romnnn.github.io/ldap-manager/charts
+  repository: https://romnn.github.io/ldap-manager/charts
   version: 0.0.23
 digest: sha256:f21c4859deb02d7c5e1c7e4d13149fadd8fd693cdbcdb9459295e24f147bf883
 generated: "2020-09-14T20:23:08.258900708+02:00"

charts/marina/Chart.yaml

@@ -15,14 +15,14 @@ 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.0.11
+version: 0.0.15
 
 # 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: 0.0.23
 
-icon: https://romnnn.github.io/marina/icons/icon_lg.jpg
+icon: https://romnn.github.io/marina/icons/icon_lg.jpg
 
 dependencies:
   - name: harbor

charts/marina/add-repos.sh

@@ -3,9 +3,9 @@ set -e
 
 export DIR=$(dirname $0)
 
-helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+helm repo add stable https://charts.helm.sh/stable
 helm repo add harbor https://helm.goharbor.io
-helm repo add ldapmanager https://romnnn.github.io/ldap-manager/charts
+helm repo add ldapmanager https://romnn.github.io/ldap-manager/charts
 
 echo "Updating dependencies for $(realpath $DIR)..."
-helm dependency update $(realpath $DIR)
+helm dependency update $(realpath $DIR)

provision-k8s.sh

@@ -4,7 +4,7 @@ IP="<YOUR_PUBLIC_IP>"
 SERVICE_USER="<YOUR_NON_ROOT_USER>"
 SERVICE_GROUP="<YOUR_NON_ROOT_USER_GROUP>"
 
-REPO="[email protected]:romnnn/ansible-playbook-istio-helm-k8s.git"
+REPO="[email protected]:romnn/ansible-playbook-istio-helm-k8s.git"
 BRANCH="master"
 OUT="/tmp/ansible-playbook-istio-helm-k8s"
 
@@ -18,4 +18,4 @@ ansible-playbook -i hosts ${OUT}/kubernetes-master.yml \
     -e apiserver_advertise_address=${IP} \
     -e node_ip=${IP} \
     -e service_user=${SERVICE_USER} \
-    -e service_group=${SERVICE_GROUP}
+    -e service_group=${SERVICE_GROUP}

public/index.html

@@ -22,7 +22,7 @@ <h2>marina</h2>
                 <p class="lead">Your own private docker and helm registry on bare-metal kubernetes.</p>
                 <hr class="my-4">
                 <p class="lead">
-                    <a class="btn btn-primary btn-lg" href="https://github.com/romnnn/marina" role="button">View
+                    <a class="btn btn-primary btn-lg" href="https://github.com/romnn/marina" role="button">View
                         on GitHub <i class="fab fa-github"></i></a>
                 </p>
             </div>
@@ -50,4 +50,4 @@ <h2>marina</h2>
     }
 </style>
 
-</html>
+</html>