Skip to content

Commit

Permalink
Merge branch 'master' into update_kompose_convert
Browse files Browse the repository at this point in the history
  • Loading branch information
leecalcote authored Jan 15, 2025
2 parents e57c1bf + 239d6e1 commit c3d958a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 27 deletions.
36 changes: 20 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
---
name: Bug/issue report
name: 🐛 General Bug Report
about: Report an issue to help improve the project.
title: ''
labels: 'kind/bug'
assignees: ''
---
**Description**
### Current Behavior
<!-- A brief description of the issue. -->

**Expected Behavior**
### Expected Behavior
<!-- A brief description of what you expected to happen. -->

**Screenshots**
### Screenshots/Logs
<!-- Add screenshots, if applicable, to help explain your problem. -->

**Environment:**
- OS: [e.g. Ubuntu]
- Browser: [e.g. Chrome, Safari]
- Version: [e.g. 22]
- Device: [e.g. laptop, iPhone 8]
### Environment

---
[Optional] **To Reproduce**
Steps to reproduce the behavior:
- **Host OS:** Mac Linux Windows
- **Platform:** Docker or Kubernetes
- **Meshery Server Version:** stable-v
- **Meshery Client Version:** stable-v

<!-- Optional
### To Reproduce
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->

[Optional] **Additional Context**
<!-- Add any other context about the problem here. -->

---
### Contributor [Guides](https://docs.meshery.io/project/contributing) and [Handbook](https://layer5.io/community/handbook)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
29 changes: 18 additions & 11 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
---
name: Feature Request
about: Suggest an enhancement to this project.
name: 💡 General Feature Request
about: Suggest an enhancement to Meshery.
title: ''
labels: 'kind/enhancement'
assignees: ''
---

**Current Behavior**
### Current Behavior
<!-- A brief description of what the problem is. (e.g. I need to be able to...) -->


**Desired Behavior**
### Desired Behavior
<!-- A brief description of the enhancement. -->

### Implementation
<!-- [Optional] Specifics on the approach to fulfilling the feature request. -->

---
**Resources**
<!-- Helpful tools and reference information. -->
### Acceptance Tests
<!-- [Optional] Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->

**Alternatives / Additional Context**
<!-- A brief description of any alternative solutions or features you've considered or other context that might be helpful. -->
### Mockups
<!-- [Optional] Any visual diagrams of the desired user interface. -->

---
### Contributor [Guides](https://docs.meshery.io/project/contributing) and [Handbook](https://layer5.io/community/handbook)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and designs for Meshery UI in [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
5 changes: 5 additions & 0 deletions utils/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ func New(kubeconfig []byte) (*Client, error) {
restConfig.QPS = float32(50)
restConfig.Burst = int(100)

// if insecure variable is kept true, allow that
if restConfig.TLSClientConfig.Insecure {
restConfig.TLSClientConfig.Insecure = true
}

// Configure kubeclient
kclient, err := kubernetes.NewForConfig(restConfig)
if err != nil {
Expand Down

0 comments on commit c3d958a

Please sign in to comment.