diff --git a/readme.md b/readme.md index bc4329d..5b9759b 100644 --- a/readme.md +++ b/readme.md @@ -43,7 +43,6 @@ metrics-server-armada-app │ │ │ ├── clusterrole.yaml │ │ │ ├── deployment.yaml │ │ │ ├── pdb.yaml -│ │ │ ├── psp.yaml │ │ │ ├── rolebinding.yaml │ │ │ ├── serviceaccount.yaml │ │ │ └── service.yaml diff --git a/stx-metrics-server-helm/debian/deb_folder/rules b/stx-metrics-server-helm/debian/deb_folder/rules index 015bb2d..19b0536 100644 --- a/stx-metrics-server-helm/debian/deb_folder/rules +++ b/stx-metrics-server-helm/debian/deb_folder/rules @@ -40,7 +40,6 @@ override_dh_auto_build: cp files/metadata.yaml $(STAGING_FLUXCD) cp -Rv fluxcd-manifests $(STAGING_FLUXCD) mkdir -p $(STAGING_FLUXCD)/charts - cp helm-charts/*.tgz $(STAGING_FLUXCD)/charts cp $(HELM_FOLDER)/metrics*.tgz $(STAGING_FLUXCD)/charts # Populate metadata. diff --git a/stx-metrics-server-helm/debian/meta_data.yaml b/stx-metrics-server-helm/debian/meta_data.yaml index 2dc490d..833ff8d 100644 --- a/stx-metrics-server-helm/debian/meta_data.yaml +++ b/stx-metrics-server-helm/debian/meta_data.yaml @@ -2,8 +2,6 @@ debname: stx-metrics-server-helm debver: 1.0-1 src_path: stx-metrics-server-helm -src_files: - - ${MY_REPO}/stx/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts revision: dist: $STX_DIST GITREVCOUNT: diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/kustomization.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/kustomization.yaml index 55fa446..2a56dc0 100644 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/kustomization.yaml +++ b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/kustomization.yaml @@ -9,5 +9,4 @@ kind: Kustomization namespace: metrics-server resources: - base - - metrics-server-psp-rolebinding - metrics-server diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/helmrelease.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/helmrelease.yaml deleted file mode 100644 index 727acba..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/helmrelease.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: "helm.toolkit.fluxcd.io/v2beta1" -kind: HelmRelease -metadata: - name: metrics-server-psp-rolebinding - labels: - chart_group: metrics-server-psp-rolebinding -spec: - releaseName: ms-metrics-server-psp-rolebinding - chart: - spec: - chart: psp-rolebinding - version: 0.1.0 - sourceRef: - kind: HelmRepository - name: stx-platform - interval: 1m - timeout: 30m - test: - enable: false - install: - disableHooks: false - upgrade: - force: true - valuesFrom: - - kind: Secret - name: metrics-server-psp-rolebinding-static-overrides - valuesKey: metrics-server-psp-rolebinding-static-overrides.yaml - - kind: Secret - name: metrics-server-psp-rolebinding-system-overrides - valuesKey: metrics-server-psp-rolebinding-system-overrides.yaml diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/kustomization.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/kustomization.yaml deleted file mode 100644 index b5b0ce2..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/kustomization.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -namespace: metrics-server -resources: - - helmrelease.yaml -secretGenerator: - - name: metrics-server-psp-rolebinding-static-overrides - files: - - metrics-server-psp-rolebinding-static-overrides.yaml - - name: metrics-server-psp-rolebinding-system-overrides - files: - - metrics-server-psp-rolebinding-system-overrides.yaml -generatorOptions: - disableNameSuffixHash: true diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-static-overrides.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-static-overrides.yaml deleted file mode 100644 index bf49c33..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-static-overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -rolebindingNamespace: metrics-server -serviceAccount: metrics-server diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-system-overrides.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-system-overrides.yaml deleted file mode 100644 index 7e93270..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server-psp-rolebinding/metrics-server-psp-rolebinding-system-overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -