From b3ccfcfb3bd48ea7bc3598bba472a9030bd1778c Mon Sep 17 00:00:00 2001 From: Daniel Molenda Date: Tue, 25 Feb 2025 13:19:53 +0100 Subject: [PATCH 1/3] Add new variables --- charts/phpipam/Chart.yaml | 2 +- charts/phpipam/README.md | 2 +- charts/phpipam/ingress.yaml | 42 ++++++++++++++++++++++++ charts/phpipam/templates/deployment.yaml | 4 +++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 charts/phpipam/ingress.yaml diff --git a/charts/phpipam/Chart.yaml b/charts/phpipam/Chart.yaml index dfc6c1c..ecb050c 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.8 +version: 1.0.9 type: application diff --git a/charts/phpipam/README.md b/charts/phpipam/README.md index 72b718e..dc6b538 100644 --- a/charts/phpipam/README.md +++ b/charts/phpipam/README.md @@ -1,6 +1,6 @@ # phpipam -![Version: 1.0.8](https://img.shields.io/badge/Version-1.0.8-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.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) phpipam is an open-source web IP address management application (IPAM) diff --git a/charts/phpipam/ingress.yaml b/charts/phpipam/ingress.yaml new file mode 100644 index 0000000..674f8f5 --- /dev/null +++ b/charts/phpipam/ingress.yaml @@ -0,0 +1,42 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + ingress.gcp.kubernetes.io/pre-shared-cert: mcrt-b277c460-fa41-4dc9-94aa-63fe8e3a6989 + ingress.kubernetes.io/backends: '{"k8s-be-31032--a87afe91bd518119":"HEALTHY","k8s1-a87afe91-phpipam-phpipam-web-80-22b80c50":"UNHEALTHY"}' + ingress.kubernetes.io/forwarding-rule: k8s2-fr-nlt15q1i-phpipam-phpipam-web-md2z2648 + ingress.kubernetes.io/redirect-url-map: k8s2-rm-nlt15q1i-phpipam-phpipam-web-md2z2648 + ingress.kubernetes.io/target-proxy: k8s2-tp-nlt15q1i-phpipam-phpipam-web-md2z2648 + ingress.kubernetes.io/url-map: k8s2-um-nlt15q1i-phpipam-phpipam-web-md2z2648 + kubernetes.io/ingress.class: gce + kubernetes.io/ingress.global-static-ip-name: phpipam-ip + meta.helm.sh/release-name: phpipam + meta.helm.sh/release-namespace: phpipam + networking.gke.io/managed-certificates: phpipam-ssl + networking.gke.io/v1beta1.FrontendConfig: phpipam-frontend-config + creationTimestamp: "2025-02-25T11:28:49Z" + finalizers: + - networking.gke.io/ingress-finalizer-V2 + generation: 1 + labels: + app.kubernetes.io/managed-by: Helm + name: phpipam-web + namespace: phpipam + resourceVersion: "767653835" + uid: db627884-1614-4d23-80ba-5ad5e26335ad +spec: + rules: + - host: phpipam.shoper.cloud + http: + paths: + - backend: + service: + name: phpipam-web + port: + number: 80 + path: / + pathType: ImplementationSpecific +status: + loadBalancer: + ingress: + - ip: 34.8.15.104 diff --git a/charts/phpipam/templates/deployment.yaml b/charts/phpipam/templates/deployment.yaml index 3e63750..5f465c1 100644 --- a/charts/phpipam/templates/deployment.yaml +++ b/charts/phpipam/templates/deployment.yaml @@ -116,6 +116,8 @@ 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" @@ -126,6 +128,8 @@ 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: From fa27f529ca95f46581b9bc0798950e166b8d98b2 Mon Sep 17 00:00:00 2001 From: Daniel Molenda Date: Tue, 25 Feb 2025 13:20:42 +0100 Subject: [PATCH 2/3] Remove ingress.yaml --- charts/phpipam/ingress.yaml | 42 ------------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 charts/phpipam/ingress.yaml diff --git a/charts/phpipam/ingress.yaml b/charts/phpipam/ingress.yaml deleted file mode 100644 index 674f8f5..0000000 --- a/charts/phpipam/ingress.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - ingress.gcp.kubernetes.io/pre-shared-cert: mcrt-b277c460-fa41-4dc9-94aa-63fe8e3a6989 - ingress.kubernetes.io/backends: '{"k8s-be-31032--a87afe91bd518119":"HEALTHY","k8s1-a87afe91-phpipam-phpipam-web-80-22b80c50":"UNHEALTHY"}' - ingress.kubernetes.io/forwarding-rule: k8s2-fr-nlt15q1i-phpipam-phpipam-web-md2z2648 - ingress.kubernetes.io/redirect-url-map: k8s2-rm-nlt15q1i-phpipam-phpipam-web-md2z2648 - ingress.kubernetes.io/target-proxy: k8s2-tp-nlt15q1i-phpipam-phpipam-web-md2z2648 - ingress.kubernetes.io/url-map: k8s2-um-nlt15q1i-phpipam-phpipam-web-md2z2648 - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: phpipam-ip - meta.helm.sh/release-name: phpipam - meta.helm.sh/release-namespace: phpipam - networking.gke.io/managed-certificates: phpipam-ssl - networking.gke.io/v1beta1.FrontendConfig: phpipam-frontend-config - creationTimestamp: "2025-02-25T11:28:49Z" - finalizers: - - networking.gke.io/ingress-finalizer-V2 - generation: 1 - labels: - app.kubernetes.io/managed-by: Helm - name: phpipam-web - namespace: phpipam - resourceVersion: "767653835" - uid: db627884-1614-4d23-80ba-5ad5e26335ad -spec: - rules: - - host: phpipam.shoper.cloud - http: - paths: - - backend: - service: - name: phpipam-web - port: - number: 80 - path: / - pathType: ImplementationSpecific -status: - loadBalancer: - ingress: - - ip: 34.8.15.104 From 092c91be9823cf6938ad594706350b188ec62cce 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:21:28 +0000 Subject: [PATCH 3/3] Reindex new charts --- index.yaml | 33 +++++++++++++++++++++++---------- packages/phpipam-1.0.9.tgz | Bin 0 -> 4031 bytes 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 packages/phpipam-1.0.9.tgz diff --git a/index.yaml b/index.yaml index e40339b..f9c42a5 100644 --- a/index.yaml +++ b/index.yaml @@ -3,7 +3,20 @@ entries: phpipam: - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.460013602Z" + created: "2025-02-25T12:21:28.680234554Z" + description: phpipam is an open-source web IP address management application (IPAM) + digest: d49e4cb83dd417d5eb74250380684bfaca9de8af74b96d72c7ef5292e4b63ded + 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.9.tgz + version: 1.0.9 + - apiVersion: v2 + appVersion: 1.7.3 + created: "2025-02-25T12:21:28.67934565Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 0816a0f084c3c6844062bda178cc44983f9c7b2f6f2f673e794dc4ac49177199 home: https://phpipam.net @@ -16,7 +29,7 @@ entries: version: 1.0.8 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.459640076Z" + created: "2025-02-25T12:21:28.678969857Z" description: phpipam is an open-source web IP address management application (IPAM) digest: e0d269d6069b70392404b6a0c7646df2e8f4bfb7a85185f58252353e6fc8a93d home: https://phpipam.net @@ -29,7 +42,7 @@ entries: version: 1.0.7 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.459286578Z" + created: "2025-02-25T12:21:28.678598602Z" description: phpipam is an open-source web IP address management application (IPAM) digest: e94a13f53d1e7081966c9ed6031abb72de6a3900714a3e6ad9536481ff2142b4 home: https://phpipam.net @@ -42,7 +55,7 @@ entries: version: 1.0.6 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.45892812Z" + created: "2025-02-25T12:21:28.678247194Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 2ef44eeec1e3ea1d16c65e59cfea314e137668268780058487e30b0932ec5860 home: https://phpipam.net @@ -55,7 +68,7 @@ entries: version: 1.0.5 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.458554094Z" + created: "2025-02-25T12:21:28.677875117Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 4dd9b64605cc25681527bc6c94ca8117774ea2eef0eeddba35a3dc6dfeecafc5 home: https://phpipam.net @@ -68,7 +81,7 @@ entries: version: 1.0.4 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.458186159Z" + created: "2025-02-25T12:21:28.677505876Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 96087eb5d6edcb7ea28935a0a26c96343d15403ca849e4aa0cbcc6b9bcf4f7a9 home: https://phpipam.net @@ -81,7 +94,7 @@ entries: version: 1.0.3 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.457780514Z" + created: "2025-02-25T12:21:28.677097822Z" description: phpipam is an open-source web IP address management application (IPAM) digest: 0ea462d3894964aa0072a6e2c4f8a781535da8264ec8af2865dcd78535ee6aa8 home: https://phpipam.net @@ -94,7 +107,7 @@ entries: version: 1.0.2 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.457377604Z" + created: "2025-02-25T12:21:28.67673325Z" description: phpipam is an open-source web IP address management application (IPAM) digest: ac6e7cd6635ca04809b8599e81e299a4d90c636677bd3c913b4321b1e8cb0b68 home: https://phpipam.net @@ -107,7 +120,7 @@ entries: version: 1.0.1 - apiVersion: v2 appVersion: 1.7.3 - created: "2025-02-25T07:18:15.456995422Z" + created: "2025-02-25T12:21:28.676355002Z" description: phpipam is an open-source web IP address management application (IPAM) digest: f5340a1b3d9683ab86efceb9a9bd803aca5f95ec2c77bbd7b7daf570478c4013 home: https://phpipam.net @@ -118,4 +131,4 @@ entries: urls: - https://dreamcommerce.github.io/phpipam-helm/packages/phpipam-1.0.0.tgz version: 1.0.0 -generated: "2025-02-25T07:18:15.456428777Z" +generated: "2025-02-25T12:21:28.675820341Z" diff --git a/packages/phpipam-1.0.9.tgz b/packages/phpipam-1.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..78197bfd6213e9f9da73f1119295a85c7fa1f996 GIT binary patch literal 4031 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 literal 0 HcmV?d00001