diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..25c4f24
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Tell us about a problem you are experiencing
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**What steps did you take:**
+[A clear and concise description steps that can be used to reproduce the problem.]
+
+**What happened:**
+[A small description of the issue]
+
+**What did you expect:**
+[A description of what was expected]
+
+**Anything else you would like to add:**
+[Additional information that will assist in solving the issue.]
+
+**Additional context:**
+Add any other context about the problem here.
+
+**Environment:**
+
+- Kubernetes version (execute `kubectl version`):
+- kapp-controller version (execute `kubectl get deployment -n kapp-controller kapp-controller -o yaml` and the annotation is `kbld.k14s.io/images`):
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dd84ea7..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**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.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..87c8ff2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Describe the problem/challenge you have:**
+[A description of the current challenge that you are experiencing.]
+
+**Describe the solution you'd like:**
+[A clear and concise description of what you want to happen. If applicable a visual representation of the UX.]
+
+**Anything else you would like to add:**
+[Additional information that will assist in solving the issue.]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-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 [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-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.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4db542d..d29011d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,6 @@ jobs:
registry-server: ghcr.io
registry-username: ${{ github.actor }}
image: ${{ github.repository }}
- version: 0.6.1+kadras.1
+ version: 0.6.2
secrets:
pull-request-token: ${{ secrets.GH_ORG_PAT }}
diff --git a/README.md b/README.md
index c6d2c9e..b58c301 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Metrics Server
+
+
This project provides a [Carvel package](https://carvel.dev/kapp-controller/docs/latest/packaging) for [Metrics Server](https://github.com/kubernetes-sigs/metrics-server), a scalable and efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
## Prerequisites
@@ -29,7 +31,7 @@ Then, install the Metrics Server package.
```shell
kctrl package install -i metrics-server \
-p metrics-server.packages.kadras.io \
- -v 0.6.1+kadras.1 \
+ -v 0.6.2 \
-n kadras-packages
```
@@ -76,7 +78,7 @@ Then, reference it from the `kctrl` command when installing or upgrading the pac
```shell
kctrl package install -i metrics-server \
-p metrics-server.packages.kadras.io \
- -v 0.6.1+kadras.1 \
+ -v 0.6.2 \
-n kadras-packages \
--values-file values.yml
```
@@ -120,6 +122,6 @@ This package is based on the original Metrics Server package used in [Tanzu Comm
## Supply Chain Security
-This project is compliant with level 2 of the [SLSA Framework](https://slsa.dev).
+This project is compliant with level 3 of the [SLSA Framework](https://slsa.dev).
-
+
diff --git a/package/config/kapp-config.yml b/package/config/kapp-config.yml
index ca69987..df6b0cc 100644
--- a/package/config/kapp-config.yml
+++ b/package/config/kapp-config.yml
@@ -9,7 +9,6 @@ rebaseRules:
- path: [spec, caBundle]
type: remove
resourceMatchers:
- - apiVersionKindMatcher: {apiVersion: apiregistration.k8s.io/v1beta1, kind: APIService}
- apiVersionKindMatcher: {apiVersion: apiregistration.k8s.io/v1, kind: APIService}
- path: [ spec, selector, matchLabels, kapp.k14s.io/app ]
type: copy
diff --git a/package/config/upstream/components.yaml b/package/config/upstream/components.yaml
index 81296de..b1787ae 100644
--- a/package/config/upstream/components.yaml
+++ b/package/config/upstream/components.yaml
@@ -137,7 +137,7 @@ spec:
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --kubelet-use-node-status-port
- --metric-resolution=15s
- image: k8s.gcr.io/metrics-server/metrics-server:v0.6.1
+ image: k8s.gcr.io/metrics-server/metrics-server:v0.6.2
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
diff --git a/package/vendir.lock.yml b/package/vendir.lock.yml
index fc62819..6403b11 100644
--- a/package/vendir.lock.yml
+++ b/package/vendir.lock.yml
@@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- githubRelease:
- tag: v0.6.1
- url: https://api.github.com/repos/kubernetes-sigs/metrics-server/releases/59100288
+ tag: v0.6.2
+ url: https://api.github.com/repos/kubernetes-sigs/metrics-server/releases/84197562
path: .
path: config/upstream
kind: LockConfig
diff --git a/package/vendir.yml b/package/vendir.yml
index 8266d0e..4600def 100644
--- a/package/vendir.yml
+++ b/package/vendir.yml
@@ -4,7 +4,7 @@ directories:
- githubRelease:
disableAutoChecksumValidation: true
slug: kubernetes-sigs/metrics-server
- tag: v0.6.1
+ tag: v0.6.2
includePaths:
- components.yaml
path: .