diff --git a/metrics-server-helm/README.rst b/metrics-server-helm/README.rst deleted file mode 100644 index e69de29..0000000 diff --git a/metrics-server-helm/debian/deb_folder/changelog b/metrics-server-helm/debian/deb_folder/changelog index 5910006..76a0c9b 100644 --- a/metrics-server-helm/debian/deb_folder/changelog +++ b/metrics-server-helm/debian/deb_folder/changelog @@ -1,5 +1,17 @@ -metrics-server-helm (1.0) unstable; urgency=medium +metrics-server-helm (3.11-0) unstable; urgency=medium + + * New upstream release. + + -- Fernando Pereira dos Santos Wed, 9 Ago 2023 11:43: +0000 + +metrics-server-helm (3.8-4) unstable; urgency=medium + + * New upstream release. + + -- Fernando Pereira dos Santos Fri, 10 Mar 2023 07:12: +0000 + +metrics-server-helm (1.0-0) unstable; urgency=medium * Initial release. - -- Fernando Pereira dos Santos Fri, 10 Mar 2023 07:12: +0000 + -- Luiz Felipe Kina Thu, 24 Mar 2022 17:50: +0000 diff --git a/metrics-server-helm/debian/deb_folder/copyright b/metrics-server-helm/debian/deb_folder/copyright index 43c8791..c43933f 100644 --- a/metrics-server-helm/debian/deb_folder/copyright +++ b/metrics-server-helm/debian/deb_folder/copyright @@ -3,7 +3,7 @@ Upstream-Name: metrics-server-helm Source: https://opendev.org/starlingx/cert-manager-armada-app/ Files: * -Copyright: (c) 2013-2021 Wind River Systems, Inc +Copyright: (c) 2013-2023 Wind River Systems, Inc License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ License: Apache-2 # If you want to use GPL v2 or later for the /debian/* files use # the following clauses, or change it to suit. Delete these two lines Files: debian/* -Copyright: 2021 Wind River Systems, Inc +Copyright: 2021-2023 Wind River Systems, Inc License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/metrics-server-helm/debian/deb_folder/rules b/metrics-server-helm/debian/deb_folder/rules index dcd252a..90d8bc4 100644 --- a/metrics-server-helm/debian/deb_folder/rules +++ b/metrics-server-helm/debian/deb_folder/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # export DH_VERBOSE = 1 -export METRICS_MGR_PKG="metrics-server-3.8.4.tgz" +export METRICS_MGR_PKG="metrics-server-3.11.0.tgz" export HELM_FOLDER=/usr/lib/helm export ROOT=debian/tmp export APP_FOLDER=$(ROOT)$(HELM_FOLDER) @@ -16,18 +16,9 @@ override_dh_auto_build: # Apply patch to code cd metrics-server && patch -p1 < ../0001-Add-sample-app-to-metrics-server.patch - # Host a server for the helm charts. - chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" \ - --storage-local-rootdir="." & - - sleep 2 - # Create the TGZ file. make metrics-server - # Terminate the helm chart server. - pkill chartmuseum - override_dh_auto_install: install -d -m 755 $(APP_FOLDER) install -p -D -m 755 *.tgz $(APP_FOLDER) diff --git a/metrics-server-helm/debian/meta_data.yaml b/metrics-server-helm/debian/meta_data.yaml index abf9bec..d4e5317 100644 --- a/metrics-server-helm/debian/meta_data.yaml +++ b/metrics-server-helm/debian/meta_data.yaml @@ -1,12 +1,12 @@ --- debname: metrics-server-helm -debver: 1.0 +debver: 3.11-0 src_path: files dl_files: - metrics-server-3.8.4.tgz: + metrics-server-3.11.0.tgz: topdir: null - url: https://github.com/kubernetes-sigs/metrics-server/releases/download/metrics-server-helm-chart-3.8.4/metrics-server-3.8.4.tgz - md5sum: 48fcb0e1cb57f8526d1b8473c42759c2 + url: https://github.com/kubernetes-sigs/metrics-server/releases/download/metrics-server-helm-chart-3.11.0/metrics-server-3.11.0.tgz + md5sum: bd58754f21818235b22bad05b2a502c6 revision: dist: $STX_DIST GITREVCOUNT: diff --git a/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch b/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch index ce528f7..5134b2f 100644 --- a/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch +++ b/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch @@ -1,9 +1,9 @@ -From 980f1e15690d8e38026d51312a3517ae26e7c80e Mon Sep 17 00:00:00 2001 +From a85c2dad038d2538a58a2c34a3e659ce73b0f601 Mon Sep 17 00:00:00 2001 From: Fernando Santos -Date: Mon, 27 Mar 2023 20:00:20 +0000 +Date: Wed, 9 Aug 2023 20:00:20 +0000 Subject: [PATCH] Add sample app to metrics-server -Signed-off-by: Luiz Felipe Kina +Signed-off-by: Fernando Santos --- templates/sample-app-cluster-role-binding.yml | 16 ++++++++++++ templates/sample-app-cluster-role.yml | 17 +++++++++++++ @@ -125,10 +125,10 @@ index 0000000..5e116c0 +{{- end }} \ No newline at end of file diff --git a/values.yaml b/values.yaml -index 21205ab..2cd8598 100644 +index fba10aa..b31a5fb 100644 --- a/values.yaml +++ b/values.yaml -@@ -148,3 +148,12 @@ topologySpreadConstraints: [] +@@ -180,3 +180,12 @@ topologySpreadConstraints: [] deploymentAnnotations: {} schedulerName: "" @@ -142,5 +142,5 @@ index 21205ab..2cd8598 100644 + tag: stx.7.0-v1.0.0 + -- -2.30.2 +2.17.1 diff --git a/metrics-server-helm/files/Makefile b/metrics-server-helm/files/Makefile index 0f838e0..b8113b2 100644 --- a/metrics-server-helm/files/Makefile +++ b/metrics-server-helm/files/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # # # SPDX-License-Identifier: Apache-2.0 # # @@ -6,8 +6,8 @@ SHELL := /bin/bash TASK := build -EXCLUDES := helm-toolkit doc tests tools logs tmp -CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) +EXCLUDES := doc tests tools logs tmp +CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) .PHONY: $(EXCLUDES) $(CHARTS) diff --git a/metrics-server-helm/files/index.yaml b/metrics-server-helm/files/index.yaml deleted file mode 100644 index 2b142ca..0000000 --- a/metrics-server-helm/files/index.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -entries: {} -generated: 2022-03-01T12:33:46.098166523-06:00 - diff --git a/metrics-server-helm/files/repositories.yaml b/metrics-server-helm/files/repositories.yaml deleted file mode 100644 index 115a085..0000000 --- a/metrics-server-helm/files/repositories.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: v1 -generated: 2022-03-02T15:19:36.215111369-06:00 -repositories: - - caFile: "" - cache: /builddir/.helm/repository/cache/local-index.yaml - certFile: "" - keyFile: "" - name: local - password: "" - url: http://127.0.0.1:8879/charts - username: "" - diff --git a/readme.md b/readme.md index 5b9759b..4aace28 100644 --- a/readme.md +++ b/readme.md @@ -6,49 +6,61 @@ This Armada App is responsible to deliver the metrics server inside the ISO. ## Structure ``` metrics-server-armada-app -├── centos_build_layer.cfg -├── centos_iso_image.inc -├── centos_pkg_dirs -├── centos_pkg_dirs_containers -├── centos_stable_docker_images.inc +├── debian_build_layer.cfg +├── debian_iso_image.inc +├── debian_pkg_dirs +├── debian_stable_docker_images.inc +├── metrics-server-helm +│ ├── debian +│ │ ├── deb_folder +│ │ │ ├── changelog +│ │ │ ├── control +│ │ │ ├── copyright +│ │ │ ├── metrics-server-helm.install +│ │ │ └── rules +│ │ └── meta_data.yaml +│ └── files +│ ├── 0001-Add-sample-app-to-metrics-server.patch +│ └── Makefile ├── readme.md ├── requirements.txt ├── sample-app -│ ├── centos -│ │ ├── docker -│ │ │ ├── Dockerfile -│ │ │ └── src -│ │ │ ├── package.json -│ │ │ └── sample-application.js +│ ├── debian │ │ └── sample-app.stable_docker_image +│ ├── docker +│ │ ├── Dockerfile.debian +│ │ └── src +│ │ ├── package.json +│ │ └── sample-application.js │ └── readme.md ├── stx-metrics-server-helm -│ ├── centos -│ │ ├── build_srpm.data -│ │ └── stx-metrics-server-helm.spec +│ ├── debian +│ │ ├── deb_folder +│ │ │ ├── changelog +│ │ │ ├── control +│ │ │ ├── copyright +│ │ │ ├── rules +│ │ │ ├── source +│ │ │ │ └── format +│ │ │ └── stx-metrics-server-helm.install +│ │ └── meta_data.yaml │ └── stx-metrics-server-helm │ ├── files -│ │ ├── index.yaml -│ │ ├── metadata.yaml -│ │ └── repositories.yaml -│ ├── helm-charts │ │ ├── Makefile +│ │ └── metadata.yaml +│ ├── fluxcd-manifests +│ │ ├── base +│ │ │ ├── helmrepository.yaml +│ │ │ ├── kustomization.yaml +│ │ │ └── namespace.yaml +│ │ ├── kustomization.yaml │ │ └── metrics-server -│ │ ├── Chart.yaml -│ │ ├── templates -│ │ │ ├── apiservice.yaml -│ │ │ ├── clusterrole-aggregated-reader.yaml -│ │ │ ├── clusterrolebinding-auth-delegator.yaml -│ │ │ ├── clusterrolebinding.yaml -│ │ │ ├── clusterrole.yaml -│ │ │ ├── deployment.yaml -│ │ │ ├── pdb.yaml -│ │ │ ├── rolebinding.yaml -│ │ │ ├── serviceaccount.yaml -│ │ │ └── service.yaml -│ │ └── values.yaml -│ └── manifests -│ └── metrics-server_manifest.yaml +│ │ ├── helmrelease.yaml +│ │ ├── kustomization.yaml +│ │ ├── metrics-server-static-overrides.yaml +│ │ └── metrics-server-system-overrides.yaml +│ └── helm-charts +│ └── Makefile ├── test-requirements.txt └── tox.ini ``` @@ -56,8 +68,6 @@ Important files - metrics-server_manifest.yaml - Armada Manifest - helm-charts - Metrics Server helm charts - stx-metrics-server-helm.spec - Steps to generate -- centos_iso_image.inc - It inserts the rpm inside the ISO -- centos_pkg_dirs - Folders to build the pkgs - sample-app - Sample app application ## Install diff --git a/sample-app/readme.md b/sample-app/readme.md index 32c03eb..2c8f84d 100644 --- a/sample-app/readme.md +++ b/sample-app/readme.md @@ -9,13 +9,13 @@ Containerized application that retrieves metrics server data ## Structure ``` sample-app -├── centos -│ ├── docker -│ │ ├── Dockerfile -│ │ └── src -│ │ ├── package.json -│ │ └── sample-application.js +├── debian │ └── sample-app.stable_docker_image +├── docker +│ ├── Dockerfile.debian +│ └── src +│ ├── package.json +│ └── sample-application.js └── readme.md ``` Important files diff --git a/stx-metrics-server-helm/debian/deb_folder/changelog b/stx-metrics-server-helm/debian/deb_folder/changelog index 1538c01..b20c59d 100644 --- a/stx-metrics-server-helm/debian/deb_folder/changelog +++ b/stx-metrics-server-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +stx-metrics-server-helm (1.1-0) unstable; urgency=medium + + * New upstream release. + + -- Fernando Pereira dos Santos Wed, 9 Ago 2023 11:43: +0000 + stx-metrics-server-helm (1.0-1) unstable; urgency=medium * Initial release. diff --git a/stx-metrics-server-helm/debian/deb_folder/copyright b/stx-metrics-server-helm/debian/deb_folder/copyright index af72a11..fcbc0c4 100644 --- a/stx-metrics-server-helm/debian/deb_folder/copyright +++ b/stx-metrics-server-helm/debian/deb_folder/copyright @@ -4,11 +4,11 @@ Upstream-Contact: StarlingX Developers Source: https://opendev.org/starlingx/metrics-server-armada-app/ Files: * -Copyright: (c) 2017-2021 Wind River Systems, Inc +Copyright: (c) 2017-2023 Wind River Systems, Inc License: Apache-2 Files: debian/* -Copyright: 2021 Wind River Systems, Inc +Copyright: 2021-2023 Wind River Systems, Inc License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/stx-metrics-server-helm/debian/deb_folder/rules b/stx-metrics-server-helm/debian/deb_folder/rules index 19b0536..66235d8 100644 --- a/stx-metrics-server-helm/debian/deb_folder/rules +++ b/stx-metrics-server-helm/debian/deb_folder/rules @@ -23,14 +23,8 @@ override_dh_auto_build: ############ # COMMON # ############ - # Host a server for the helm charts. - chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." & - sleep 2 - helm repo add local http://localhost:8879/charts # Create the TGZ file. cd helm-charts && make - # Terminate the helm chart server. - pkill chartmuseum ############ # FLUXCD # diff --git a/stx-metrics-server-helm/debian/meta_data.yaml b/stx-metrics-server-helm/debian/meta_data.yaml index 833ff8d..3214d7a 100644 --- a/stx-metrics-server-helm/debian/meta_data.yaml +++ b/stx-metrics-server-helm/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debname: stx-metrics-server-helm -debver: 1.0-1 +debver: 1.1-0 src_path: stx-metrics-server-helm revision: dist: $STX_DIST diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/files/Makefile b/stx-metrics-server-helm/stx-metrics-server-helm/files/Makefile index 0f838e0..b8113b2 100644 --- a/stx-metrics-server-helm/stx-metrics-server-helm/files/Makefile +++ b/stx-metrics-server-helm/stx-metrics-server-helm/files/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # # # SPDX-License-Identifier: Apache-2.0 # # @@ -6,8 +6,8 @@ SHELL := /bin/bash TASK := build -EXCLUDES := helm-toolkit doc tests tools logs tmp -CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) +EXCLUDES := doc tests tools logs tmp +CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) .PHONY: $(EXCLUDES) $(CHARTS) diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/files/index.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/files/index.yaml deleted file mode 100644 index 36db709..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/files/index.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v1 -entries: {} -generated: 2019-01-07T12:33:46.098166523-06:00 diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/files/repositories.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/files/repositories.yaml deleted file mode 100644 index e613b63..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/files/repositories.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -generated: 2019-01-02T15:19:36.215111369-06:00 -repositories: -- caFile: "" - cache: /builddir/.helm/repository/cache/local-index.yaml - certFile: "" - keyFile: "" - name: local - password: "" - url: http://127.0.0.1:8879/charts - username: "" - diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml index badb110..0928ed9 100644 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml +++ b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -14,7 +14,7 @@ spec: chart: spec: chart: metrics-server - version: 3.8.4 + version: 3.11.0 sourceRef: kind: HelmRepository name: stx-platform diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/metrics-server-static-overrides.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/metrics-server-static-overrides.yaml index 7d8a170..8c19127 100644 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/metrics-server-static-overrides.yaml +++ b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/metrics-server-static-overrides.yaml @@ -1,15 +1,15 @@ # -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # imagePullSecrets: [{"name": "default-registry-key"}] -args: +args: - --kubelet-insecure-tls replicas: 1 image: - repository: k8s.gcr.io/metrics-server/metrics-server - tag: "v0.6.2" + repository: registry.k8s.io/metrics-server/metrics-server + tag: "v0.6.4" tolerations: - key: "node-role.kubernetes.io/control-plane" operator: "Exists"