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: Updated values file #76

Merged
merged 2 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
134 changes: 134 additions & 0 deletions charts/orchestrator/values-int.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to specify values, that are already present in the default values.yaml.
please only specify stuff that is actually overwritten or additionally defined.
This makes it clearer to others, which parts of the config are environment specific

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated files

Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
#################################################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,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
################################################################################

# -- Number of Replicas for pods
replicaCount: 1

image:
# -- Image to use for deploying an application
repository: tractusx/managed-service-orchestrator
# -- Set the Image Pull Policy
pullPolicy: Always
# -- Image tage is defined in chart appVersion
tag: ""

imagePullSecrets: []

serviceAccount:
# -- Specifies whether a service account should be created
create: true
# -- Annotations to add to the service account
annotations: {}
# -- The name of the service account to use. If not set and create is true, a name is generated using the fullname template
name: ""
podAnnotations: {}

portContainer: 9999

podSecurityContext:
fsGroup: 2000

securityContext:
# -- Controls whether a process can gain more privilege
allowPrivilegeEscalation: false
runAsUser: 1000
runAsNonRoot: true
probe:
endpoint: "/api/healthz"

service:
# -- Type of service
type: ClusterIP
# -- Port details for sevice
port: 9999
# -- Container Port details for sevice
portContainer: 9999

ingress:
# -- If you want to enable or disable the ingress
enabled: false
# -- a reference to an Ingress Class resource that contains additional configuration including the name of the controller that should implement the class
className: nginx
# -- Annotations to add to the ingress
annotations:
nginx.ingress.kubernetes.io/backend-protocol: HTTP
cert-manager.io/cluster-issuer: "letsencrypt-prod"
nginx.ingress.kubernetes.io/affinity: "cookie"
nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"

# -- Host of the application on which application runs
host: ""

resources:
limits:
# -- set a maximum amount of allows CPU utilization by specifying a limit on the container.
cpu: 900m
# -- set a maximum amount of allows memory utilization by specifying a limit on the container.
memory: 2Gi
requests:
# -- sets the minimum amount of CPU required for the container
cpu: 400m
# -- set a minimum amount of allows memory utilization by specifying a limit on the container.
memory: 2Gi

autoscaling:
enabled: false
nodeSelector: {}
tolerations: []

affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: DoesNotExist
topologyKey: kubernetes.io/hostname

livenessProbe:
failureThreshold: 3
initialDelaySeconds: 60
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
readinessProbe:
failureThreshold: 3
initialDelaySeconds: 60
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1

secretRef: "managed-service-orchestrator-int-secret"

postgresql:
# -- Enable the dependency postgres database
enabled: true
metrics:
containerSecurityContext:
enabled: false
auth:
username: "orchdbuser"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will accept this change, since it at least fixes the default values, but you need to remove the hardcoded passwords. either use a secure vault, or use the auto-generated passwords provided by the bitnami chart

database: "orchdb"
existingSecret: "managed-service-orchestrator-int-secret"
secretKeys:
adminPasswordKey: "postgres-password"
userPasswordKey: "password"
18 changes: 7 additions & 11 deletions charts/orchestrator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ ingress:
# -- a reference to an Ingress Class resource that contains additional configuration including the name of the controller that should implement the class
className: nginx
# -- Annotations to add to the ingress
annotations:
nginx.ingress.kubernetes.io/backend-protocol: HTTP
cert-manager.io/cluster-issuer: "letsencrypt-prod"
nginx.ingress.kubernetes.io/affinity: "cookie"
nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
annotations: {}

# -- Host of the application on which application runs
host: ""
Expand Down Expand Up @@ -117,7 +113,7 @@ readinessProbe:
successThreshold: 1
timeoutSeconds: 1

secretRef: "managed-service-orchestrator-int-secret"
secretRef: ""

postgresql:
# -- Enable the dependency postgres database
Expand All @@ -126,9 +122,9 @@ postgresql:
containerSecurityContext:
enabled: false
auth:
username: "orchdbuser"
database: "orchdb"
existingSecret: "managed-service-orchestrator-int-secret"
username: ""
database: ""
existingSecret: ""
secretKeys:
adminPasswordKey: "postgres-password"
userPasswordKey: "password"
adminPasswordKey: ""
userPasswordKey: ""