Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: enable resource config & remove unnecessary configs from helm-charts #1277

Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
15f145b
fix: enable resource config & remove unnecessary configs from helm-ch…
florianrusch-zf May 3, 2024
eb0bda4
remove duplicate line in migration guide
florianrusch-zf May 31, 2024
292958f
streamline services regarding labels & annotations
florianrusch-zf May 31, 2024
9bbbbe4
add missing network policy to azure chart
florianrusch-zf May 31, 2024
c8c4d4d
Update values documentations
florianrusch-zf May 31, 2024
341bd6a
Remove value `businessPartnerValidation.log.agreementValidation`
florianrusch-zf May 31, 2024
3a9ce8d
Remove helm-docs version from README.md footer
florianrusch-zf May 31, 2024
3bbf6ed
Remove unnecessary values from memory chart
florianrusch-zf May 31, 2024
6efa437
fix merge conflict left overs
florianrusch-zf May 31, 2024
f3dd294
fix broken indentations
florianrusch-zf May 31, 2024
fe88bbb
add documentation about control api
florianrusch-zf May 31, 2024
f5708cd
fix missing empty line at EOF
florianrusch-zf May 31, 2024
24ab797
update copyright
florianrusch-zf May 31, 2024
93f6fe7
update test deployment values
florianrusch-zf May 31, 2024
e127e87
remove usage of `businessPartnerValidation.log.agreementValidation`
florianrusch-zf May 31, 2024
f15fcab
update dependency file
florianrusch-zf May 31, 2024
cb529ea
fix wrong require
florianrusch-zf May 31, 2024
371c3f6
Remove unnecessary if statement for required value
florianrusch-zf Jun 10, 2024
3fba43d
Merge remote-tracking branch 'origin/main' into fix/enable-default-re…
florianrusch-zf Jun 10, 2024
e093a74
Use similar memory values for control and dataplane
florianrusch-zf Jun 11, 2024
94383bb
Merge remote-tracking branch 'origin/main' into fix/enable-default-re…
florianrusch-zf Jun 11, 2024
174e6ef
Regenerate README.md's
florianrusch-zf Jun 11, 2024
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
3 changes: 2 additions & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clea
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.30.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.39.1, Apache-2.0, approved, #14830
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.39.3, Apache-2.0, approved, #14830
maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/10.7.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/11.9.1, Apache-2.0, approved, #12667
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.17.0, , restricted, clearlydefined
Expand Down Expand Up @@ -546,7 +547,7 @@ maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.21, EPL-2.0 OR Apache-2.0,
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.flywaydb/flyway-core/10.13.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.13.0, , restricted, clearlydefined
maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.13.0, NOASSERTION, restricted, clearlydefined
maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
Expand Down
132 changes: 68 additions & 64 deletions charts/tractusx-connector-azure-vault/README.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion charts/tractusx-connector-azure-vault/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{

{{ template "chart.valuesSection" . }}

{{ template "helm-docs.versionFooter" . }}
----------------------------------------------
Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs/)
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ spec:
## IATP / STS / DIM CONFIG ##
#############################
- name: "EDC_IAM_STS_OAUTH_TOKEN_URL"
value: {{ .Values.iatp.sts.oauth.token_url | required ".Values.iatp.oauth.token_url is required" | quote}}
value: {{ .Values.iatp.sts.oauth.token_url | required ".Values.iatp.sts.oauth.token_url is required" | quote}}
- name: "EDC_IAM_STS_OAUTH_CLIENT_ID"
value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}}
- name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS"
Expand All @@ -289,10 +289,8 @@ spec:
## BDRS CLIENT ##
#################

{{- if .Values.controlplane.bdrs.server.url }}
- name: "TX_IAM_IATP_BDRS_SERVER_URL"
value: {{ .Values.controlplane.bdrs.server.url | required ".Values.controlplane.bdrs.server.url is required" | quote }}
{{- end }}
florianrusch-zf marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.controlplane.bdrs.cache_validity_seconds }}
- name: "TX_IAM_IATP_BDRS_CACHE_VALIDITY"
value: {{ .Values.controlplane.bdrs.cache_validity_seconds | quote}}
Expand Down Expand Up @@ -322,14 +320,6 @@ spec:
value: {{ .Values.vault.azure.certificate | quote }}
{{- end }}



###########################
## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
###########################
- name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
value: {{ .Values.controlplane.businessPartnerValidation.log.agreementValidation | quote }}

######################################
## Additional environment variables ##
######################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ spec:
## IATP / STS / DIM CONFIG ##
#############################
- name: "EDC_IAM_STS_OAUTH_TOKEN_URL"
value: {{ .Values.iatp.sts.oauth.token_url | required ".Values.iatp.oauth.token_url is required" | quote}}
value: {{ .Values.iatp.sts.oauth.token_url | required ".Values.iatp.sts.oauth.token_url is required" | quote}}
- name: "EDC_IAM_STS_OAUTH_CLIENT_ID"
value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}}
- name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS"
Expand Down
46 changes: 46 additions & 0 deletions charts/tractusx-connector-azure-vault/templates/networkpolicy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#################################################################################
# Copyright (c) 2024 ZF Friedrichshafen AG
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
#################################################################################

{{- if eq (.Values.networkPolicy.enabled | toString) "true" }}
{{- range tuple "controlplane" "dataplane" }}
{{- $name := . }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: {{ include "txdc.fullname" $ }}-{{ $name }}
labels:
{{- include (printf "txdc.%s.labels" $name) $ | nindent 4 }}
spec:
podSelector:
matchLabels:
{{- include (printf "txdc.%s.selectorLabels" $name) $ | nindent 6 }}
ingress:
- from:
{{- toYaml (index $.Values.networkPolicy $name "from") | nindent 6 }}
ports:
{{- range $key,$value := (index $.Values $name "endpoints") }}
- port: {{ $value.port }}
protocol: TCP
{{- end }}
policyTypes:
- Ingress
---
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#################################################################################
# Copyright (c) 2023 ZF Friedrichshafen AG
# Copyright (c) 2023,2024 ZF Friedrichshafen AG
# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -26,9 +26,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "txdc.fullname" . }}-controlplane
namespace: {{ .Release.Namespace | default "default" | quote }}
namespace: {{ .Release.Namespace }}
{{- with .Values.controlplane.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "txdc.controlplane.labels" . | nindent 4 }}
{{- with .Values.controlplane.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.controlplane.service.type }}
ports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
#################################################################################
# Copyright (c) 2024 ZF Friedrichshafen AG
# Copyright (c) 2023,2024 Contributors to the Eclipse Foundation
#
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
#################################################################################

---
apiVersion: v1
kind: Service
metadata:
name: {{ include "txdc.fullname" . }}-dataplane
namespace: {{ .Release.Namespace | default "default" | quote }}
namespace: {{ .Release.Namespace }}
{{- with .Values.dataplane.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "txdc.dataplane.labels" . | nindent 4 }}
{{- with .Values.dataplane.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.dataplane.service.type }}
ports:
Expand Down
Loading