diff --git a/deploy/key-migration-utility/install.sh b/deploy/key-migration-utility/install.sh index cc031eec..1608b92c 100755 --- a/deploy/key-migration-utility/install.sh +++ b/deploy/key-migration-utility/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=key-migration-utility -CHART_VERSION=1.3.0-develop +CHART_VERSION=1.3.0 echo Creating $NS namespace kubectl create ns $NS diff --git a/deploy/keymanager/install.sh b/deploy/keymanager/install.sh index 798a1a58..1299bcf3 100755 --- a/deploy/keymanager/install.sh +++ b/deploy/keymanager/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=keymanager -CHART_VERSION=1.3.0-develop +CHART_VERSION=1.3.0 echo Creating $NS namespace kubectl create ns $NS diff --git a/deploy/softhsm/install.sh b/deploy/softhsm/install.sh index 8ba6c794..cf12010b 100755 --- a/deploy/softhsm/install.sh +++ b/deploy/softhsm/install.sh @@ -8,7 +8,7 @@ if [ $# -ge 1 ] ; then fi NS=softhsm -CHART_VERSION=1.3.0-develop +CHART_VERSION=1.3.0 echo Create $NS namespaces kubectl create ns $NS diff --git a/helm/key-migration-utility/Chart.yaml b/helm/key-migration-utility/Chart.yaml index 0ba01862..70925037 100644 --- a/helm/key-migration-utility/Chart.yaml +++ b/helm/key-migration-utility/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: key-migration-utility description: A Helm chart to migrate keys from any keystore type to any other supported format. type: application -version: 1.3.0-develop +version: 1.3.0 appVersion: "" dependencies: - name: common diff --git a/helm/key-migration-utility/values.yaml b/helm/key-migration-utility/values.yaml index 95b87f2c..7afa29e1 100644 --- a/helm/key-migration-utility/values.yaml +++ b/helm/key-migration-utility/values.yaml @@ -26,8 +26,8 @@ extraDeploy: [] replicaCount: 1 image: registry: docker.io - repository: mosipqa/keys-migrator - tag: 1.3.x + repository: mosipid/keys-migrator + tag: 1.3.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 diff --git a/helm/keygen/Chart.yaml b/helm/keygen/Chart.yaml index 8346794d..efa0373b 100644 --- a/helm/keygen/Chart.yaml +++ b/helm/keygen/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: keygen description: A Helm chart to generate keys type: application -version: 1.3.0-develop +version: 1.3.0 appVersion: "" dependencies: - name: common diff --git a/helm/keygen/values.yaml b/helm/keygen/values.yaml index 8145d2db..94612ddf 100644 --- a/helm/keygen/values.yaml +++ b/helm/keygen/values.yaml @@ -26,8 +26,8 @@ extraDeploy: [] replicaCount: 1 image: registry: docker.io - repository: mosipqa/keys-generator - tag: 1.3.x + repository: mosipid/keys-generator + tag: 1.3.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 diff --git a/helm/keymanager/Chart.yaml b/helm/keymanager/Chart.yaml index 573c698a..741b8782 100644 --- a/helm/keymanager/Chart.yaml +++ b/helm/keymanager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: keymanager description: A Helm chart for MOSIP Keymanager module type: application -version: 1.3.0-develop +version: 1.3.0 appVersion: "" dependencies: - name: common diff --git a/helm/keymanager/values.yaml b/helm/keymanager/values.yaml index bc348b07..2c8078fb 100644 --- a/helm/keymanager/values.yaml +++ b/helm/keymanager/values.yaml @@ -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 @@ -49,11 +44,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/kernel-keymanager-service - tag: 1.3.x + repository: mosipid/kernel-keymanager-service + tag: 1.3.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 @@ -65,10 +59,8 @@ image: ## # pullSecrets: # - myRegistryKeySecretName - ## Port on which this particular spring service module is running. springServicePort: 8088 - ## Configure extra options for liveness and readiness probes ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes ## @@ -82,7 +74,6 @@ startupProbe: timeoutSeconds: 5 failureThreshold: 30 successThreshold: 1 - livenessProbe: enabled: true httpGet: @@ -93,7 +84,6 @@ livenessProbe: timeoutSeconds: 5 failureThreshold: 6 successThreshold: 1 - readinessProbe: enabled: true httpGet: @@ -104,7 +94,6 @@ readinessProbe: timeoutSeconds: 5 failureThreshold: 6 successThreshold: 1 - ## # existingConfigmap: @@ -112,12 +101,10 @@ readinessProbe: ## 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: @@ -131,37 +118,31 @@ resources: requests: cpu: 1000m memory: 3600Mi - additionalResources: ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources ## Example: java_opts: "-Xms500M -Xmx500M" javaOpts: "-Xms2700M -Xmx4000M" - ## 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 @@ -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/ ## @@ -223,18 +198,14 @@ lifecycleHooks: - sh - -c - sleep 30 - ## Termination grace perios : the maximum amount of time (in seconds) Kubernetes will wait for a container to gracefully shut down terminationGracePeriodSeconds: 60 - ## 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 @@ -242,7 +213,6 @@ customReadinessProbe: {} ## updateStrategy: type: RollingUpdate - ## Additional environment variables to set ## Example: ## extraEnvVars: @@ -250,7 +220,6 @@ updateStrategy: ## value: "bar" ## extraEnvVars: [] - ## ConfigMap with extra environment variables that used ## extraEnvVarsCM: @@ -258,19 +227,15 @@ extraEnvVarsCM: - config-server-share - artifactory-share - softhsm-kernel-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: @@ -282,7 +247,6 @@ extraVolumeMounts: [] ## containerPort: 1234 ## initContainers: {} - ## Add sidecars to the pods. ## Example: ## sidecars: @@ -294,7 +258,6 @@ initContainers: {} ## containerPort: 1234 ## sidecars: {} - persistence: enabled: false ## If defined, storageClassName: @@ -319,7 +282,6 @@ persistence: mountDir: /home/mosip/config/ volume_name: config # pvc_claim_name: pkcs12-keys.p12 - ## Init containers parameters: ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. ## @@ -353,12 +315,10 @@ volumePermissions: ## cpu: 100m ## memory: 128Mi ## - ## Specifies whether RBAC resources should be created ## rbac: create: true - ## Specifies whether a ServiceAccount should be created ## serviceAccount: @@ -367,7 +327,6 @@ serviceAccount: ## If not set and create is true, a name is generated using the fullname template ## name: - ## Prometheus Metrics ## metrics: @@ -377,9 +336,7 @@ metrics: ## podAnnotations: prometheus.io/scrape: "true" - endpointPath: /v1/keymanager/actuator/prometheus - ## Prometheus Service Monitor ## ref: https://github.com/coreos/prometheus-operator ## @@ -406,7 +363,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 @@ -424,12 +380,10 @@ metrics: # labels: # severity: error rules: [] - ## Only internal access istio: enabled: true gateway: istio-system/internal prefix: /v1/keymanager - springConfigNameEnv: activeProfileEnv: diff --git a/helm/softhsm/Chart.yaml b/helm/softhsm/Chart.yaml index 2f97bfc8..3e6ef6a5 100644 --- a/helm/softhsm/Chart.yaml +++ b/helm/softhsm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: softhsm description: A Helm chart for MOSIP Softhsm module type: application -version: 1.3.0-beta.4-develop +version: 1.3.0 appVersion: "" dependencies: - name: common