Skip to content

Commit

Permalink
[DSD-6430] inji-web release changes (#489)
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>

* Update install.sh

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

* Update install.sh

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

* Update install.sh

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

* [DSD-6430] release changes

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

* [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 dbfd687 commit 6332637
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 68 deletions.
2 changes: 1 addition & 1 deletion deploy/inji-config-server/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
fi

NS=config-server
CHART_VERSION=0.0.1-develop
CHART_VERSION=12.0.1

echo Create $NS namespace
kubectl create ns $NS
Expand Down
4 changes: 2 additions & 2 deletions deploy/mimoto-apitestrig/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
fi

NS=mimoto
CHART_VERSION=0.0.1-develop
CHART_VERSION=12.0.1

echo Create $NS namespace
kubectl create ns $NS
Expand Down Expand Up @@ -127,4 +127,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
set -o errtrace # trace ERR through 'time command' and other functions
set -o pipefail # trace ERR through pipes
installing_apitestrig # calling function
installing_apitestrig # calling function
4 changes: 2 additions & 2 deletions deploy/mimoto-apitestrig/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ modules:
mimoto:
enabled: true
image:
repository: mosipqa/apitest-mimoto
tag: release-0.14.x
repository: mosipid/apitest-mimoto
tag: 0.14.0
pullPolicy: Always
pms:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion deploy/mimoto/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
fi

NS=mimoto
MIMOTO_CHART_VERSION=0.0.1-develop
MIMOTO_CHART_VERSION=0.14.0

echo Create $NS namespace
kubectl create ns $NS
Expand Down
2 changes: 1 addition & 1 deletion helm/mimoto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: mimoto
description: A Helm chart for MOSIP mimoto Application
type: application
version: 0.0.1-develop
version: 0.14.0
appVersion: ""
dependencies:
- name: common
Expand Down
62 changes: 3 additions & 59 deletions helm/mimoto/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 @@ -50,11 +45,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: mosipqa/mimoto
tag: develop
repository: mosipid/mimoto
tag: 0.14.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 @@ -66,12 +60,10 @@ 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
##
## TODO: enable probes once health urls are available

startupProbe:
enabled: true
httpGet:
Expand All @@ -82,7 +74,6 @@ startupProbe:
timeoutSeconds: 5
failureThreshold: 30
successThreshold: 1

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

readinessProbe:
enabled: true
httpGet:
Expand All @@ -104,20 +94,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 @@ -131,37 +118,31 @@ resources:
requests:
cpu: 100m
memory: 1000Mi

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

## 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
containerSecurityContext:
enabled: false
runAsUser: mosip
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,50 +192,41 @@ 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 that used
##
extraEnvVarsCM:
- global
- inji-config-server-share
- artifactory-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 @@ -275,17 +241,7 @@ initContainers:
- command:
- /bin/bash
- -c
- if [ "$ENABLE_INSECURE" = "true" ]; then HOST=$( env | grep "mosip-api-internal-host"
|sed "s/mosip-api-internal-host=//g"); if [ -z "$HOST" ]; then echo "HOST
$HOST is empty; EXITING"; exit 1; fi; openssl s_client -servername "$HOST"
-connect "$HOST":443 > "$HOST.cer" 2>/dev/null & sleep 2 ; sed -i -ne '/-BEGIN
CERTIFICATE-/,/-END CERTIFICATE-/p' "$HOST.cer"; cat "$HOST.cer"; /usr/local/openjdk-11/bin/keytool
-delete -alias "$HOST" -keystore $JAVA_HOME/lib/security/cacerts -storepass
changeit; /usr/local/openjdk-11/bin/keytool -trustcacerts -keystore "$JAVA_HOME/lib/security/cacerts"
-storepass changeit -noprompt -importcert -alias "$HOST" -file "$HOST.cer"
; if [ $? -gt 0 ]; then echo "Failed to add SSL certificate for host $host;
EXITING"; exit 1; fi; cp /usr/local/openjdk-11/lib/security/cacerts /cacerts;
fi
- if [ "$ENABLE_INSECURE" = "true" ]; then HOST=$( env | grep "mosip-api-internal-host" |sed "s/mosip-api-internal-host=//g"); if [ -z "$HOST" ]; then echo "HOST $HOST is empty; EXITING"; exit 1; fi; openssl s_client -servername "$HOST" -connect "$HOST":443 > "$HOST.cer" 2>/dev/null & sleep 2 ; sed -i -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' "$HOST.cer"; cat "$HOST.cer"; /usr/local/openjdk-11/bin/keytool -delete -alias "$HOST" -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit; /usr/local/openjdk-11/bin/keytool -trustcacerts -keystore "$JAVA_HOME/lib/security/cacerts" -storepass changeit -noprompt -importcert -alias "$HOST" -file "$HOST.cer" ; if [ $? -gt 0 ]; then echo "Failed to add SSL certificate for host $host; EXITING"; exit 1; fi; cp /usr/local/openjdk-11/lib/security/cacerts /cacerts; fi
env:
- name: ENABLE_INSECURE
value: "true"
Expand All @@ -303,7 +259,6 @@ initContainers:
volumeMounts:
- mountPath: /cacerts
name: cacerts

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

persistence:
enabled: false
storageClass: longhorn
Expand Down Expand Up @@ -344,7 +298,6 @@ persistence:
labels:
purpose: landing-folder
reclaimPolicy: Retain

## 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 @@ -378,12 +331,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 @@ -392,7 +343,6 @@ serviceAccount:
## If not set and create is true, a name is generated using the fullname template
##
name: mimoto

## Prometheus Metrics
##
## TODO: Enable when prometheus url is available
Expand All @@ -403,9 +353,7 @@ metrics:
##
podAnnotations:
prometheus.io/scrape: "true"

endpointPath:

## Prometheus Service Monitor
## ref: https://github.com/coreos/prometheus-operator
##
Expand All @@ -432,7 +380,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 @@ -450,7 +397,6 @@ metrics:
# labels:
# severity: error
rules: []

## Requires public access.
istio:
enabled: true
Expand All @@ -460,9 +406,7 @@ istio:
prefix1: /residentmobileapp
prefix2: /v1/mimoto
rewrite: /v1/mimoto

enable_insecure: false

volumes:
secrets:
mimotooidc:
Expand Down
4 changes: 2 additions & 2 deletions partner-onboarder/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [ "$flag" = "n" ]; then
fi

NS=mimoto
CHART_VERSION=0.0.1-develop
CHART_VERSION=12.0.1

echo Create $NS namespace
kubectl create ns $NS
Expand Down Expand Up @@ -102,4 +102,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
set -o errtrace # trace ERR through 'time command' and other functions
set -o pipefail # trace ERR through pipes
installing_onboarder # calling function
installing_onboarder # calling function

0 comments on commit 6332637

Please sign in to comment.