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

Update #13

Merged
merged 14 commits into from
Jun 1, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
updating workflow
Signed-off-by: Michael Fornaro <[email protected]>
  • Loading branch information
xunholy committed Jun 1, 2020
commit 830862371bb63f2d3111a1eb15978100925e6d83
38 changes: 38 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,40 @@ name: build
on: ['pull_request']

jobs:
generate:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Generate Manifests
run: |
./install/helm.sh

- name: Check for modified files
id: git-check
run: |
modified=$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)
echo ::set-output name=modified::$modified

- name: Commit latest release version
if: steps.git-check.outputs.modified == 'true'
run: |
git config --global user.name 'Michael Fornaro'
git config --global user.email '[email protected]'
git add .
git commit -sm "[Auto Generation] Adding hydrated manifests" || exit 0

- name: Push changes
if: steps.git-check.outputs.modified == 'true'
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.head_ref }}

validate:
runs-on: ubuntu-latest
needs: generate
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -21,6 +53,12 @@ jobs:
- name: Lint Yaml
uses: ibiqlik/action-yamllint@v1

- name: Helm Check
uses: igabaydulin/[email protected]
env:
CHART_LOCATION: ./helm-check-action-sample
CHART_VALUES: ./helm-check-action-sample/values/test.yaml

- name: Kubeval
uses: instrumenta/kubeval-action@master
with:
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/helm-operator.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .yamllint → .yamllint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Ignoring helm-operator.yaml is this is download and comes from upstream with lint errors
ignore: |
.yamllint
.github/
.yamllint
.github/
helm-operator.yaml

extends: default
rules:
Expand All @@ -18,4 +20,4 @@ rules:
min-spaces-inside: 0
max-spaces-inside: 0
indentation:
indent-sequences: consistent
indent-sequences: consistent
100 changes: 50 additions & 50 deletions namespaces/flux/helm-operator/helm-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ roleRef:
name: default-helm-operator
subjects:
- name: default-helm-operator
namespace: 'flux'
namespace: "flux"
kind: ServiceAccount
---
# Source: helm-operator/templates/service.yaml
Expand Down Expand Up @@ -109,62 +109,62 @@ spec:
app: helm-operator
release: default
strategy:
type: Recreate
type: Recreate
template:
metadata:
annotations:
checksum/repositories: 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
checksum/repositories: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
labels:
app: helm-operator
release: default
spec:
serviceAccountName: default-helm-operator
volumes:
- name: git-key
secret:
secretName: flux-git-deploy
defaultMode: 0400
- name: git-key
secret:
secretName: flux-git-deploy
defaultMode: 0400
containers:
- name: flux-helm-operator
image: 'docker.io/raspbernetes/helm-operator:v1.0.0-rc9'
imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: 3030
livenessProbe:
httpGet:
port: 3030
path: /healthz
initialDelaySeconds: 1
periodSeconds: 10
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
port: 3030
path: /healthz
initialDelaySeconds: 1
periodSeconds: 10
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
volumeMounts:
- name: git-key
mountPath: /etc/fluxd/ssh
readOnly: true
args:
- --enabled-helm-versions=v3
- --log-format=fmt
- --git-timeout=20s
- --git-poll-interval=5m
- --charts-sync-interval=5m
- --status-update-interval=60s
- --update-chart-deps=true
- --log-release-diffs=false
- --workers=4
- --tiller-namespace=kube-system
resources:
requests:
cpu: 50m
memory: 64Mi
- name: flux-helm-operator
image: "docker.io/raspbernetes/helm-operator:v1.0.0-rc9"
imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: 3030
livenessProbe:
httpGet:
port: 3030
path: /healthz
initialDelaySeconds: 1
periodSeconds: 10
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
port: 3030
path: /healthz
initialDelaySeconds: 1
periodSeconds: 10
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
volumeMounts:
- name: git-key
mountPath: /etc/fluxd/ssh
readOnly: true
args:
- --enabled-helm-versions=v3
- --log-format=fmt
- --git-timeout=20s
- --git-poll-interval=5m
- --charts-sync-interval=5m
- --status-update-interval=60s
- --update-chart-deps=true
- --log-release-diffs=false
- --workers=4
- --tiller-namespace=kube-system
resources:
requests:
cpu: 50m
memory: 64Mi