Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
registry-server: ghcr.io
registry-username: ${{ github.actor }}
image: ${{ github.repository }}
version: 0.6.4
version: 0.7.0
secrets:
pull-request-token: ${{ secrets.GH_ORG_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Integration Tests
strategy:
matrix:
k8s_version: [v1.26, v1.27, v1.28]
k8s_version: [v1.27, v1.28, v1.29]
permissions:
contents: read
uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
K8S_VERSION=v1.28
K8S_VERSION=v1.29

# Build package configuration
build: package
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ A Carvel package for [Metrics Server](https://github.com/kubernetes-sigs/metrics

### Prerequisites

* Kubernetes 1.26+
* Kubernetes 1.27+
* Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI.
* Carvel [kapp-controller](https://carvel.dev/kapp-controller) deployed in your Kubernetes cluster. You can install it with Carvel [`kapp`](https://carvel.dev/kapp/docs/latest/install) (recommended choice) or `kubectl`.

Expand Down
2 changes: 1 addition & 1 deletion package/config/overlays/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
containers:
#@overlay/match by=overlay.subset({"name": "metrics-server"})
- args:
#@overlay/match by=overlay.subset("--secure-port=4443")
#@overlay/match by=overlay.subset("--secure-port=10250")
- #@ "--secure-port=" + str(data.values.metricsServer.config.securePort)
#@overlay/append
- --kubelet-insecure-tls
Expand Down
2 changes: 1 addition & 1 deletion package/config/overlays/namespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#@ if hasattr(data.values.metricsServer, 'namespace') and data.values.metricsServer.namespace:
#@ metricsServerNamespace = data.values.metricsServer.namespace
#@ else:
#@ metricsServerNamespace = data.values.namespace
#@ metricsServerNamespace = data.values.namespace
#@ end

#@ if data.values.metricsServer.createNamespace:
Expand Down
11 changes: 8 additions & 3 deletions package/config/upstream/components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ spec:
containers:
- args:
- --cert-dir=/tmp
- --secure-port=4443
- --secure-port=10250
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --kubelet-use-node-status-port
- --metric-resolution=15s
image: registry.k8s.io/metrics-server/metrics-server:v0.6.4
image: registry.k8s.io/metrics-server/metrics-server:v0.7.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand All @@ -148,7 +148,7 @@ spec:
periodSeconds: 10
name: metrics-server
ports:
- containerPort: 4443
- containerPort: 10250
name: https
protocol: TCP
readinessProbe:
Expand All @@ -165,9 +165,14 @@ spec:
memory: 200Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: RuntimeDefault
volumeMounts:
- mountPath: /tmp
name: tmp-dir
Expand Down
4 changes: 2 additions & 2 deletions package/vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- githubRelease:
tag: v0.6.4
url: https://api.github.com/repos/kubernetes-sigs/metrics-server/releases/113485257
tag: v0.7.0
url: https://api.github.com/repos/kubernetes-sigs/metrics-server/releases/137632772
path: .
path: config/upstream
kind: LockConfig
2 changes: 1 addition & 1 deletion package/vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ directories:
- githubRelease:
disableAutoChecksumValidation: true
slug: kubernetes-sigs/metrics-server
tag: v0.6.4
tag: v0.7.0
includePaths:
- components.yaml
path: .
Expand Down
4 changes: 2 additions & 2 deletions test/setup/kind/v1.27/kind-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.27.3
image: kindest/node:v1.27.11
- role: worker
image: kindest/node:v1.27.3
image: kindest/node:v1.27.11
4 changes: 2 additions & 2 deletions test/setup/kind/v1.28/kind-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.28.0
image: kindest/node:v1.28.7
- role: worker
image: kindest/node:v1.28.0
image: kindest/node:v1.28.7
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.26.6
image: kindest/node:v1.29.2
- role: worker
image: kindest/node:v1.26.6
image: kindest/node:v1.29.2