Skip to content

Commit

Permalink
Merge pull request #49 from kubescape/dev
Browse files Browse the repository at this point in the history
Pulling dev branch into master - Automated PR by CICD
  • Loading branch information
matanshk authored Jan 18, 2023
2 parents bd8901a + e8fec00 commit 91cf709
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/00-cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: merge-to-master
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
MERGE_COMMIT_MESSAGE: "Merge to master - PR number: {pullRequest.number}"
MERGE_ERROR_FAIL: "true"
MERGE_METHOD: "merge"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/01-update_tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ jobs:
with:
destination_branch: "master"
pr_title: "Pulling ${{ github.ref_name }} branch into master - Automated PR by CICD"

github_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}

- name: get latest commit sha
id: commit-ref
run: echo "COMMIT_REF=$(git log --oneline | head -n1 | awk {'print $1}')" >> $GITHUB_OUTPUT

- name: echo commit ref
run: echo ${{ steps.commit-ref.outputs.COMMIT_REF }}
run: echo ${{ steps.commit-ref.outputs.COMMIT_REF }}
2 changes: 1 addition & 1 deletion .github/workflows/03-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 03-Helm chart release

on:
workflow_dispatch:

workflow_call:
inputs:
COMMIT_REF:
Expand Down
6 changes: 4 additions & 2 deletions charts/kubescape-cloud-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ 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.9.2

version: 1.9.3

# 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.9.2

appVersion: 1.9.3

maintainers:
- name: Ben Hirschberg
Expand Down
2 changes: 1 addition & 1 deletion charts/kubescape-cloud-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ operator:
image:
# -- source code: https://github.com/kubescape/operator
repository: quay.io/kubescape/operator
tag: v0.1.8
tag: v0.1.10
pullPolicy: Always

service:
Expand Down

0 comments on commit 91cf709

Please sign in to comment.