From 3d97970453a464ea5874bd3be63f5f7bbde5d427 Mon Sep 17 00:00:00 2001 From: Daniel Molenda Date: Tue, 25 Feb 2025 13:35:44 +0100 Subject: [PATCH 1/2] Add annotations for service --- charts/phpipam/Chart.yaml | 2 +- charts/phpipam/README.md | 3 ++- charts/phpipam/templates/deployment.yaml | 8 ++++---- charts/phpipam/templates/service.yaml | 4 ++++ charts/phpipam/values.yaml | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/charts/phpipam/Chart.yaml b/charts/phpipam/Chart.yaml index ecb050c..40783f0 100644 --- a/charts/phpipam/Chart.yaml +++ b/charts/phpipam/Chart.yaml @@ -5,5 +5,5 @@ name: phpipam home: https://phpipam.net sources: - https://github.com/dreamcommerce/phpipam-helm -version: 1.0.9 +version: 1.0.10 type: application diff --git a/charts/phpipam/README.md b/charts/phpipam/README.md index dc6b538..0c2b77f 100644 --- a/charts/phpipam/README.md +++ b/charts/phpipam/README.md @@ -1,6 +1,6 @@ # phpipam -![Version: 1.0.9](https://img.shields.io/badge/Version-1.0.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.3](https://img.shields.io/badge/AppVersion-1.7.3-informational?style=flat-square) +![Version: 1.0.10](https://img.shields.io/badge/Version-1.0.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.3](https://img.shields.io/badge/AppVersion-1.7.3-informational?style=flat-square) phpipam is an open-source web IP address management application (IPAM) @@ -54,6 +54,7 @@ phpipam is an open-source web IP address management application (IPAM) | phpipam.resources.limits.memory | string | `"2048Mi"` | | | phpipam.resources.requests.cpu | string | `"50m"` | | | phpipam.resources.requests.memory | string | `"32Mi"` | | +| phpipam.service.annotations | object | `{}` | | | phpipam.service.port | int | `80` | | | phpipam.service.type | string | `"ClusterIP"` | | | phpipam.widgets | object | `{}` | | diff --git a/charts/phpipam/templates/deployment.yaml b/charts/phpipam/templates/deployment.yaml index 5f465c1..637cdcb 100644 --- a/charts/phpipam/templates/deployment.yaml +++ b/charts/phpipam/templates/deployment.yaml @@ -44,6 +44,10 @@ spec: successThreshold: 1 timeoutSeconds: 5 env: + - name: "IPAM_DISABLE_INSTALLER" + value: {{ .Values.global.installer | default "false" }} + - name: "IPAM_TRUST_X_FORWARDED" + value: {{ .Values.phpipam.xforwarded | default "false" }} - name: "IPAM_DATABASE_HOST" value: {{ .Values.database.name }} - name: "IPAM_DATABASE_USER" @@ -116,8 +120,6 @@ spec: - name: {{ .Values.cron.name }} image: "{{ .Values.cron.image.repository }}:{{ .Values.cron.image.tag | default .Chart.AppVersion }}" env: - - name: "IPAM_DISABLE_INSTALLER" - value: {{ .Values.global.installer | default "false" }} - name: "IPAM_DATABASE_HOST" value: {{ .Values.database.name }} - name: "IPAM_DATABASE_USER" @@ -128,8 +130,6 @@ spec: value: "%" - name: "SCAN_INTERVAL" value: {{ .Values.cron.scan_interval }} - - name: "IPAM_TRUST_X_FORWARDED" - value: {{ .Values.phpipam.xforwarded | default "false" }} - name: "IPAM_DATABASE_PASS" valueFrom: secretKeyRef: diff --git a/charts/phpipam/templates/service.yaml b/charts/phpipam/templates/service.yaml index e4f71f0..017283c 100644 --- a/charts/phpipam/templates/service.yaml +++ b/charts/phpipam/templates/service.yaml @@ -5,6 +5,10 @@ apiVersion: v1 metadata: name: {{ .Values.database.name }} namespace: {{ .Release.Namespace }} + annotations: + {{ if .Values.phpipam.service.annotations }} + {{ toYaml .Values.phpipam.service.annotations | nindent 4 }} + {{ end }} labels: app: {{ .Chart.Name }} component: mysql diff --git a/charts/phpipam/values.yaml b/charts/phpipam/values.yaml index a2b443b..a13ccf1 100644 --- a/charts/phpipam/values.yaml +++ b/charts/phpipam/values.yaml @@ -14,6 +14,7 @@ phpipam: tag: "v1.7.3" replicaCount: 1 service: + annotations: {} type: ClusterIP port: 80 resources: From 485b23914c704c8f1eb99994083e5dac36b0ed3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 12:36:34 +0000 Subject: [PATCH 2/2] Reindex new charts --- index.yaml | 35 ++++++++++++++++++++++++----------- packages/phpipam-1.0.10.tgz | Bin 0 -> 4048 bytes 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 packages/phpipam-1.0.10.tgz diff --git a/index.yaml b/index.yaml index f9c42a5..56dd9d5 100644 --- a/index.yaml +++ b/index.yaml @@ -3,7 +3,20 @@ entries: phpipam: - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.680234554Z" + created: "2025-02-25T12:36:34.867325922Z" + description: phpipam is an open-source web IP address management application (IPAM) + digest: 6a6ad387cc52def339889488884a1afb576d975830c9bcd267821c78fc005199 + home: https://phpipam.net + name: phpipam + sources: + - https://github.com/dreamcommerce/phpipam-helm + type: application + urls: + - https://dreamcommerce.github.io/phpipam-helm/packages/phpipam-1.0.10.tgz + version: 1.0.10 + - apiVersion: v2 + appVersion: 1.7.3 + created: "2025-02-25T12:36:34.871106894Z" description: phpipam is an open-source web IP address management application (IPAM) digest: d49e4cb83dd417d5eb74250380684bfaca9de8af74b96d72c7ef5292e4b63ded home: https://phpipam.net @@ -16,7 +29,7 @@ entries: version: 1.0.9 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.67934565Z" + created: "2025-02-25T12:36:34.870549347Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 0816a0f084c3c6844062bda178cc44983f9c7b2f6f2f673e794dc4ac49177199 home: https://phpipam.net @@ -29,7 +42,7 @@ entries: version: 1.0.8 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.678969857Z" + created: "2025-02-25T12:36:34.869585983Z" description: phpipam is an open-source web IP address management application (IPAM) digest: e0d269d6069b70392404b6a0c7646df2e8f4bfb7a85185f58252353e6fc8a93d home: https://phpipam.net @@ -42,7 +55,7 @@ entries: version: 1.0.7 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.678598602Z" + created: "2025-02-25T12:36:34.869184161Z" description: phpipam is an open-source web IP address management application (IPAM) digest: e94a13f53d1e7081966c9ed6031abb72de6a3900714a3e6ad9536481ff2142b4 home: https://phpipam.net @@ -55,7 +68,7 @@ entries: version: 1.0.6 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.678247194Z" + created: "2025-02-25T12:36:34.868824408Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 2ef44eeec1e3ea1d16c65e59cfea314e137668268780058487e30b0932ec5860 home: https://phpipam.net @@ -68,7 +81,7 @@ entries: version: 1.0.5 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.677875117Z" + created: "2025-02-25T12:36:34.8684569Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 4dd9b64605cc25681527bc6c94ca8117774ea2eef0eeddba35a3dc6dfeecafc5 home: https://phpipam.net @@ -81,7 +94,7 @@ entries: version: 1.0.4 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.677505876Z" + created: "2025-02-25T12:36:34.868090463Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 96087eb5d6edcb7ea28935a0a26c96343d15403ca849e4aa0cbcc6b9bcf4f7a9 home: https://phpipam.net @@ -94,7 +107,7 @@ entries: version: 1.0.3 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.677097822Z" + created: "2025-02-25T12:36:34.867728465Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 0ea462d3894964aa0072a6e2c4f8a781535da8264ec8af2865dcd78535ee6aa8 home: https://phpipam.net @@ -107,7 +120,7 @@ entries: version: 1.0.2 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.67673325Z" + created: "2025-02-25T12:36:34.866901808Z" description: phpipam is an open-source web IP address management application (IPAM) digest: ac6e7cd6635ca04809b8599e81e299a4d90c636677bd3c913b4321b1e8cb0b68 home: https://phpipam.net @@ -120,7 +133,7 @@ entries: version: 1.0.1 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T12:21:28.676355002Z" + created: "2025-02-25T12:36:34.866526415Z" description: phpipam is an open-source web IP address management application (IPAM) digest: f5340a1b3d9683ab86efceb9a9bd803aca5f95ec2c77bbd7b7daf570478c4013 home: https://phpipam.net @@ -131,4 +144,4 @@ entries: urls: - https://dreamcommerce.github.io/phpipam-helm/packages/phpipam-1.0.0.tgz version: 1.0.0 -generated: "2025-02-25T12:21:28.675820341Z" +generated: "2025-02-25T12:36:34.865982707Z" diff --git a/packages/phpipam-1.0.10.tgz b/packages/phpipam-1.0.10.tgz new file mode 100644 index 0000000000000000000000000000000000000000..54d1e33b6af8e9ecf80119eda55041618355b831 GIT binary patch literal 4048 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