Skip to content

Commit

Permalink
[DSD-6430] inji-web release changes (#153)
Browse files Browse the repository at this point in the history
* Updated chart versions, image and tag for release changes

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [DSD-6430] release changes

Signed-off-by: Praful Rakhade <[email protected]>

---------

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Praful Rakhade <[email protected]>
Co-authored-by: Prafulrakhade <[email protected]>
Co-authored-by: Praful Rakhade <[email protected]>
  • Loading branch information
3 people authored Oct 16, 2024
1 parent 202f44d commit 046f049
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 50 deletions.
2 changes: 1 addition & 1 deletion helm/inji-web/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: injiweb
description: A Helm chart for MOSIP injiweb UI module
type: application
version: 0.10.0-develop
version: 0.10.0
appVersion: ""
dependencies:
- name: common
Expand Down
5 changes: 3 additions & 2 deletions helm/inji-web/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ if [ $# -ge 1 ] ; then
fi

NS=injiweb
CHART_VERSION=0.10.0-develop
CHART_VERSION=0.10.0
DATASHARE_CHART_VERSION=1.3.0-beta.1

DEFAULT_MOSIP_INJIWEB_HOST=$( kubectl get cm global -n config-server -o jsonpath={.data.mosip-injiweb-host} )
# Check if MOSIP_INJIWEB_HOST is present under configmap/global of configserver
Expand Down Expand Up @@ -56,7 +57,7 @@ function installing_inji-web() {
helm -n $NS install datashare-inji mosip/datashare \
-f datashare-values.yaml \
--set istio.gateway.servers[0].hosts[0]=$INJI_DATASHARE_HOST \
--version $CHART_VERSION
--version $DATASHARE_CHART_VERSION

INJI_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-injiweb-host})
echo Installing INJIWEB
Expand Down
49 changes: 2 additions & 47 deletions helm/inji-web/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,18 @@
##
commonLabels:
app.kubernetes.io/component: mosip

## Add annotations to all the deployed resources
##
commonAnnotations: {}

## Kubernetes Cluster Domain
##
clusterDomain: cluster.local

## Extra objects to deploy (value evaluated as a template)
##
extraDeploy: []

## Number of nodes
##
replicaCount: 1

service:
type: ClusterIP
port: 80
Expand All @@ -48,12 +43,10 @@ service:
## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
##
externalTrafficPolicy: Cluster

image:
registry: docker.io
repository: mosipdev/inji-web
tag: develop

repository: mosipid/inji-web
tag: 0.10.0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand All @@ -65,7 +58,6 @@ image:
##
# pullSecrets:
# - myRegistryKeySecretName

## Configure extra options for liveness and readiness probes
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
##
Expand All @@ -80,7 +72,6 @@ startupProbe:
timeoutSeconds: 5
failureThreshold: 30
successThreshold: 1

livenessProbe:
enabled: true
httpGet:
Expand All @@ -91,7 +82,6 @@ livenessProbe:
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1

readinessProbe:
enabled: true
httpGet:
Expand All @@ -102,20 +92,17 @@ readinessProbe:
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1

##
# existingConfigmap:

## Command and args for running the container (set to default if not set). Use array form
##
command: []
args: []

## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []

## ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
resources:
Expand All @@ -129,12 +116,10 @@ resources:
requests:
cpu: 100m
memory: 50Mi

additionalResources:
## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
## Example: java_opts: "-Xms500M -Xmx500M"
javaOpts: "-Xms750M -Xmx750M"

## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
## Clamav container already runs as 'mosip' user, so we may not need to enable this
container_user: 'mosip'
Expand All @@ -143,25 +128,21 @@ containerSecurityContext:
runAsUser: 0
allowPrivilegeEscalation: false
# runAsNonRoot: true

## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
##
podSecurityContext:
enabled: false
fsGroup: 1001

## Pod affinity preset
## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
## Allowed values: soft, hard
##
podAffinityPreset: ""

## Pod anti-affinity preset
## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
## Allowed values: soft, hard
##
podAntiAffinityPreset: soft

## Node affinity preset
## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
## Allowed values: soft, hard
Expand All @@ -183,32 +164,26 @@ nodeAffinityPreset:
## - e2e-az2
##
values: []

## Affinity for pod assignment. Evaluated as a template.
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
##
affinity: {}

## Node labels for pod assignment. Evaluated as a template.
## ref: https://kubernetes.io/docs/user-guide/node-selection/
##
nodeSelector: {}

## Tolerations for pod assignment. Evaluated as a template.
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
##
tolerations: []

## Pod extra labels
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
##
podLabels: {}

## Annotations for server pods.
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
podAnnotations: {}

## pods' priority.
## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
##
Expand All @@ -217,31 +192,26 @@ podAnnotations: {}
## lifecycleHooks for the container to automate configuration before or after startup.
##
lifecycleHooks: {}

## Custom Liveness probes for
##
customLivenessProbe: {}

## Custom Rediness probes
##
customReadinessProbe: {}

## Update strategy - only really applicable for deployments with RWO PVs attached
## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
## terminate the single previous pod, so that the new, incoming pod can attach to the PV
##
updateStrategy:
type: RollingUpdate

## Additional environment variables to set
## Example:
## extraEnvVars:
## - name: FOO
## value: "bar"
##
extraEnvVars: []

## ConfigMap with extra environment variables
##
extraEnvVarsCM:
Expand All @@ -250,19 +220,15 @@ extraEnvVarsCM:
- artifactory-share
- injiweb-ui
# - softhsm-esignet-share

## Secret with extra environment variables
##
extraEnvVarsSecret:

## Extra volumes to add to the deployment
##
extraVolumes: []

## Extra volume mounts to add to the container
##
extraVolumeMounts: []

## Add init containers to the pods.
## Example:
## initContainers:
Expand All @@ -274,7 +240,6 @@ extraVolumeMounts: []
## containerPort: 1234
##
initContainers: {}

## Add sidecars to the pods.
## Example:
## sidecars:
Expand All @@ -286,7 +251,6 @@ initContainers: {}
## containerPort: 1234
##
sidecars: {}

persistence:
enabled: false
## If defined, storageClassName: <storageClass>
Expand All @@ -308,7 +272,6 @@ persistence:
existingClaim:
# Dir where config and keys are written inside container
mountDir:

## Init containers parameters:
## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
##
Expand Down Expand Up @@ -342,12 +305,10 @@ volumePermissions:
## cpu: 100m
## memory: 128Mi
##

## Specifies whether RBAC resources should be created
##
rbac:
create: true

## Specifies whether a ServiceAccount should be created
##
serviceAccount:
Expand All @@ -356,7 +317,6 @@ serviceAccount:
## If not set and create is true, a name is generated using the fullname template
##
name:

## Prometheus Metrics
##
metrics:
Expand All @@ -366,9 +326,7 @@ metrics:
##
podAnnotations:
prometheus.io/scrape: "true"

endpointPath:

## Prometheus Service Monitor
## ref: https://github.com/coreos/prometheus-operator
##
Expand All @@ -395,7 +353,6 @@ metrics:
## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
##
additionalLabels: {}

## Custom PrometheusRule to be defined
## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
Expand All @@ -413,7 +370,6 @@ metrics:
# labels:
# severity: error
rules: []

## The url below is to access esignet API services.
## CAUTION: Domain name to access injiweb UI must be secure/internal/over vpn.
## Slash is important!
Expand All @@ -427,7 +383,6 @@ inji_web:
DEFAULT_FEVICON: 'favicon.ico'
DEFAULT_TITLE: 'Inji Web'
esignet_redirect_url: 'esignet.sandbox.xyz.net'

## injiweb UI swagger should have only internal access. Hence linked to internal gateway
## We create a gateway for esignet specific URL(s) listed under `hosts`
istio:
Expand Down

0 comments on commit 046f049

Please sign in to comment.