Merge pull request #380 from open-edge-platform/upgrade_issue

Upgrade issue

Author: hemanthsm

attestation-verifier/src/build/image/tagent/entrypoint.sh

@@ -37,6 +37,7 @@ if [ ! -z "$TA_SERVICE_MODE" ] && [ "$TA_SERVICE_MODE" == "outbound" ]; then
 fi
 
 if [ ! -f $CONFIG_DIR/.setup_done ]; then
+  echo "*** Performing initial setup for tagent ***"
   for directory in $PRODUCT_BIN_DIR $CA_CERTS_DIR $CERTDIR_TRUSTEDJWTCERTS $CREDENTIALS_DIR $CONSTANTS_VAR_DIR $SYSTEM_INFO_DIR $RAMFS_DIR; do
     mkdir -p $directory
     if [ $? -ne 0 ]; then
@@ -53,6 +54,7 @@ if [ ! -f $CONFIG_DIR/.setup_done ]; then
   fi
 
   touch $CONFIG_DIR/.setup_done
+  echo "*** Initial setup for tagent completed ***"
 fi
 
   # Create /opt/ima_policy

helm/Makefile

@@ -15,7 +15,7 @@ HELM_REPOSITORY      ?= edge-orch/trusted-compute
 HELM_REGISTRY        ?= oci://080137407410.dkr.ecr.us-west-2.amazonaws.com/
 HELM_CHART_BUILD_DIR ?= build/_output/
 
-HELM_TARGETS := attestation-manager attestation-verifier trustagent trusted-workload
+HELM_TARGETS := attestation-verifier trusted-workload
 
 all: build lint test unittest
 	@# Help: Runs build, lint, test stages for all subprojects
@@ -70,11 +70,6 @@ docker-build:
 docker-push: ## Push docker images.
 	@echo "This is a dummy docker-push target."
 
-.update-version-attestation-manager:
-	@echo "Updating the version of attestation-manager to ${ATTESTATION_MANAGER_VERSION}"
-	yq eval -i '.appVersion = "${ATTESTATION_MANAGER_VERSION}"' attestation-manager/Chart.yaml
-	yq eval -i '.version = "${ATTESTATION_MANAGER_VERSION}"' attestation-manager/Chart.yaml
-
 .update-version-attestation-verifier:
 	@echo "Updating the version of attestation-verifier to ${ATTESTATION_VERIFIER_VERSION}"
 	yq eval -i '.appVersion = "${ATTESTATION_VERIFIER_VERSION}"' attestation-verifier/Chart.yaml
@@ -86,12 +81,8 @@ docker-push: ## Push docker images.
 		sed -i "s/^version:.*/version: ${ATTESTATION_VERIFIER_VERSION}/" "$$file"; \
 		sed -i "s/^\(\s*version:\).*/\1 ${ATTESTATION_VERIFIER_VERSION}/" "$$file"; \
 	done; \
+	yq eval -i '.config.imaAllowlist |= sub("<ATTESTATION_VERIFIER_VERSION>", "${ATTESTATION_VERIFIER_VERSION}")' attestation-verifier/charts/trustagent/values.yaml
 
-.update-version-trustagent:
-	@echo "Updating the version of trustagent to ${ATTESTATION_VERIFIER_VERSION}"
-	yq eval -i '.appVersion = "${ATTESTATION_VERIFIER_VERSION}"' trustagent/Chart.yaml
-	yq eval -i '.version = "${ATTESTATION_VERIFIER_VERSION}"' trustagent/Chart.yaml
-	yq eval -i '.config.imaAllowlist |= sub("<ATTESTATION_VERIFIER_VERSION>", "${ATTESTATION_VERIFIER_VERSION}")' trustagent/values.yaml
 
 .update-version-trusted-workload:
 	@echo "Updating the version of trusted-workload to ${TRUSTED_WORKLOAD_VERSION}"

helm/attestation-verifier/Chart.yaml

@@ -37,9 +37,12 @@ dependencies:
   - name: cleanup-jobs
     repository: file://./charts/cleanup-jobs/
     version: 0.0.8
-  - name: trustagent-aas-manager
-    repository: file://./charts/trustagent-aas-manager
-    version: 0.0.8    
+  - name: attestation-manager
+    repository: file://./charts/attestation-manager/
+    version: 0.0.8
+  - name: trustagent
+    repository: file://./charts/trustagent/
+    version: 0.0.8
 description: A Helm chart for Deploying Attestation Verifier
 name: attestation-verifier
 type: application

helm/attestation-verifier/charts/aas/templates/backup-volumes.yaml

@@ -2,13 +2,11 @@
 {{- if .Values.global }}
 ---
 {{ include "factory.pvBaseCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.global.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/
 {{- else }}
 ---
 {{ include "factory.pvBaseCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/
 {{- end }}

helm/attestation-verifier/charts/aas/templates/base-pv.yaml

@@ -6,7 +6,6 @@ metadata:
   name: {{ include "factory.name" . }}-base
   namespace: {{ .Release.Namespace }}
 spec:
-  storageClassName: manual
   accessModes:
 {{ toYaml  .Values.storage.hostPath.accessModes | indent 4 }}
   resources:

helm/attestation-verifier/charts/aas/templates/base-pvc.yaml

@@ -2,13 +2,11 @@
 {{- if .Values.global }}
 ---
 {{ include "factory.pvConfigCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.global.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/config
 {{- else }}
 ---
 {{ include "factory.pvConfigCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/config
 {{- end }}

helm/attestation-verifier/charts/aas/templates/config-pv.yaml

@@ -1,7 +1,6 @@
 {{- include "factory.headers" . }}
 ---
 {{ include "factory.pvcConfigCommonSpec" . }}
-  storageClassName: manual
   accessModes:
      {{ toYaml .Values.storage.hostPath.accessModes | nindent 4 | trim}}
   resources:

helm/attestation-verifier/charts/aas/templates/config-pvc.yaml

@@ -7,8 +7,6 @@
         fsGroup: {{ .Values.securityContext.aasdbInit.fsGroup }}
       initContainers:
         {{- include "factory.initCommonSpecLinkDBVolumes" . | nindent 8 }}
-          securityContext:
-            {{- toYaml .Values.securityContext.aasdb | nindent 12 }}
       containers:
         - name: {{ include "factory.name" . }}db
           {{ include "factory.imageDb" . | nindent 10 | trim }}

helm/attestation-verifier/charts/aas/templates/db-deployment.yaml

@@ -2,13 +2,11 @@
 {{- if .Values.global }}
 ---
 {{ include "factory.pvDbCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.global.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/db/
 {{- else }}
 ---
 {{ include "factory.pvDbCommonSpec" . }}
-  storageClassName: manual
   hostPath:
     path: {{ .Values.storage.hostPath.path }}/verifier/{{ .Values.service.directoryName }}/db
 {{- end }}