Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
matanshk authored Jan 18, 2023
2 parents 5f7976a + bd8901a commit e8fec00
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 26 deletions.
22 changes: 11 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
labels: 'bug'
assignees: ''

---

# Describe the bug
A clear and concise description of what the bug is.
# Description
<!-- A clear and concise description of what the bug is. -->

# Environment
Version: the version that Kubescape helm version you are running
```
Your current version is:
```

OS: ` ` <!-- the OS + version you’re running Kubescape on, e.g Ubuntu 22.04 LTS -->
Version: ` ` <!-- the version that Kubescape reports when you run `kubescape version` -->

# Steps To Reproduce
<!--
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->

# Expected behavior
A clear and concise description of what you expected to happen.
<!-- A clear and concise description of what you expected to happen. -->

# Actual Behavior
A clear and concise description of what happened. If applicable, add screenshots to help explain your problem.
<!-- A clear and concise description of what happened. If applicable, add screenshots to help explain your problem. -->

# Additional context
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
22 changes: 13 additions & 9 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
labels: 'feature'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
## Overview
<!-- A brief overview of the related current state -->

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
## Problem
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
## Solution
<!-- A clear and concise description of what you want to happen. -->

**Additional context**
Add any other context or screenshots about the feature request here.
## Alternatives
<!-- A clear and concise description of any alternative solutions or features you've considered. -->

## Additional context
<!-- Add any other context or screenshots about the feature request here. -->

41 changes: 37 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,47 @@
## Describe your changes
## Overview
<!-- Please provide a brief overview of the changes made in this pull request. e.g. current behavior/future behavior -->

## Screenshots - If Any (Optional)
<!--
## Additional Information
## Issue ticket number and link
> Any additional information that may be useful for reviewers to know
-->

<!--
## How to Test
> Please provide instructions on how to test the changes made in this pull request
-->

<!--
## Examples/Screenshots
> Here you add related screenshots
-->

<!--
## Related issues/PRs:
Here you add related issues and PRs.
If this resolved an issue, write "Resolved #<issue number>
e.g. If this PR resolves issues 1 and 2, it should look as follows:
* Resolved #1
* Resolved #2
-->

<!--
## Checklist before requesting a review
put an [x] in the box to get it checked
- [ ] My code follows the style guidelines of this project
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have commented on my code, particularly in hard-to-understand areas
- [ ] I have performed a self-review of my code
- [ ] If it is a core feature, I have added thorough tests.
- [ ] New and existing unit tests pass locally with my changes
**Please open the PR against the `dev` branch (Unless the PR contains only documentation changes)**
-->

2 changes: 2 additions & 0 deletions charts/kubescape-cloud-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,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: 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.3

maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/kubescape-prometheus-integrator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ description:

type: application

version: 0.0.5
version: 0.0.6

appVersion: "v0.0.5"
appVersion: "v0.0.6"

maintainers:
- name: Ben Hirschberg
Expand Down

0 comments on commit e8fec00

Please sign in to comment.