diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3eb384c..d08dae85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,9 @@ jobs: run: go run mage.go EnsureMage - name: Test run: mage -v Test + env: + PORTER_AGENT_REPOSITORY: carolynvs/porter-agent + PORTER_AGENT_VERSION: canary-dev - name: Report Unit Test Coverage uses: codecov/codecov-action@v1 with: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index aa7ae105..8b762caa 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,6 +13,6 @@ configMapGenerator: name: manager-config images: -- digest: sha256:935f36db1078f41e7614750d3d3f791135fc1e418aeb782814828a7b36a24ea2 +- digest: sha256:959a96e68a2b8d117c52575ab9dd4ecb24d97902574fc8f992c281d75ffcc67d name: manager newName: localhost:5000/porterops-controller diff --git a/controllers/agentaction_controller.go b/controllers/agentaction_controller.go index 901d028e..72ae5280 100644 --- a/controllers/agentaction_controller.go +++ b/controllers/agentaction_controller.go @@ -409,9 +409,9 @@ func (r *AgentActionReconciler) createAgentJob(ctx context.Context, log logr.Log // Mount the volumes used by this pod as the nonroot user // Porter's agent doesn't run as root and won't have access to files on the volume // otherwise. - SecurityContext: &corev1.PodSecurityContext{ - FSGroup: pointer.Int64Ptr(65532), - }, + //SecurityContext: &corev1.PodSecurityContext{ + // FSGroup: pointer.Int64Ptr(65532), + //}, }, }, }, diff --git a/controllers/agentaction_controller_test.go b/controllers/agentaction_controller_test.go index 515837bb..24cd2b36 100644 --- a/controllers/agentaction_controller_test.go +++ b/controllers/agentaction_controller_test.go @@ -441,6 +441,7 @@ func TestAgentActionReconciler_createAgentJob(t *testing.T) { assert.Equal(t, "porter-config", podTemplate.Spec.Volumes[1].Name, "expected the porter-config volume") assert.Equal(t, "porter-workdir", podTemplate.Spec.Volumes[2].Name, "expected the porter-workdir volume") assert.Equal(t, "porteraccount", podTemplate.Spec.ServiceAccountName, "incorrect service account for the pod") + //assert.Equal(t, 65532, podTemplate.Spec.SecurityContext.FSGroup, "incorrect fs group") // Verify the agent container agentContainer := podTemplate.Spec.Containers[0]