Merge branch 'main' into docker-docker

hyperledger-labs · Mar 28, 2024 · cf94773 · cf94773
2 parents dde0af4 + 06995d6
commit cf94773
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/pkg/offering/base/ca/override/deployment.go b/pkg/offering/base/ca/override/deployment.go
@@ -184,7 +184,7 @@ func (o *Override) CommonDeployment(instance *current.IBPCA, deployment *dep.Dep
 	}
 
 	// set seccompProfile to RuntimeDefault
-	common.GetPodSecurityContext(caCont)
+	common.SetPodSecurityContext(caCont)
 
 	return nil
 }

diff --git a/pkg/offering/base/console/override/deployment.go b/pkg/offering/base/console/override/deployment.go
@@ -189,7 +189,7 @@ func (o *Override) CommonDeployment(instance *current.IBPConsole, deployment *de
 	resourcesRequest := instance.Spec.Resources
 	if !instance.Spec.UsingRemoteDB() {
 		couchdb := deployment.MustGetContainer(COUCHDB)
-
+		common.SetPodSecurityContext(couchdb)
 		if instance.Spec.ConnectionString != "" {
 			connectionURL, err := url.Parse(instance.Spec.ConnectionString)
 			if err != nil {
@@ -320,9 +320,9 @@ func (o *Override) CommonDeployment(instance *current.IBPConsole, deployment *de
 	init.SetCommand([]string{"sh", "-c", initCommand})
 
 	// set seccompProfile to RuntimeDefault
-	common.GetPodSecurityContext(console)
-	common.GetPodSecurityContext(deployer)
-	common.GetPodSecurityContext(configtxlator)
+	common.SetPodSecurityContext(console)
+	common.SetPodSecurityContext(deployer)
+	common.SetPodSecurityContext(configtxlator)
 
 	return nil
 }

diff --git a/pkg/offering/base/orderer/override/deployment.go b/pkg/offering/base/orderer/override/deployment.go
@@ -318,8 +318,8 @@ func (o *Override) CommonDeploymentOverrides(instance *current.IBPOrderer, deplo
 	deployment.UpdateInitContainer(initCont)
 
 	// set seccompProfile to RuntimeDefault
-	common.GetPodSecurityContext(orderer)
-	common.GetPodSecurityContext(grpcProxy)
+	common.SetPodSecurityContext(orderer)
+	common.SetPodSecurityContext(grpcProxy)
 
 	return nil
 }

diff --git a/pkg/offering/base/peer/override/deployment.go b/pkg/offering/base/peer/override/deployment.go
@@ -734,8 +734,8 @@ func (o *Override) CommonDeploymentOverrides(instance *current.IBPPeer, deployme
 	deployment.UpdateContainer(grpcContainer)
 
 	// set seccompProfile to RuntimeDefault
-	common.GetPodSecurityContext(peerContainer)
-	common.GetPodSecurityContext(grpcContainer)
+	common.SetPodSecurityContext(peerContainer)
+	common.SetPodSecurityContext(grpcContainer)
 
 	return nil
 }

diff --git a/pkg/offering/common/override.go b/pkg/offering/common/override.go
@@ -108,11 +108,12 @@ func GetPodAntiAffinity(orgName string) *corev1.PodAntiAffinity {
 	}
 }
 
-func GetPodSecurityContext(con container.Container) {
+func SetPodSecurityContext(con container.Container) {
 	secContext := con.SecurityContext
 	if secContext.SeccompProfile == nil {
 		secContext.SeccompProfile = &corev1.SeccompProfile{
 			Type: corev1.SeccompProfileTypeRuntimeDefault,
 		}
 	}
+	con.SecurityContext = secContext
 }