Skip to content

Commit

Permalink
Merge pull request #1133 from equinor/master
Browse files Browse the repository at this point in the history
release radix-operator
  • Loading branch information
nilsgstrabo authored Jun 17, 2024
2 parents 86d467f + 0132297 commit 4b48833
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions charts/radix-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: radix-operator
version: 1.36.0
appVersion: 1.56.0
version: 1.36.1
appVersion: 1.56.1
kubeVersion: ">=1.24.0"
description: Radix Operator
keywords:
Expand Down
2 changes: 1 addition & 1 deletion pipeline-runner/steps/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func (s *buildTestSuite) Test_BuildDeploy_JobSpecAndDeploymentConsistent() {
// Check init containers
s.ElementsMatch([]string{"internal-nslookup", "clone", "internal-chmod"}, slice.Map(job.Spec.Template.Spec.InitContainers, func(c corev1.Container) string { return c.Name }))
cloneContainer, _ := slice.FindFirst(job.Spec.Template.Spec.InitContainers, func(c corev1.Container) bool { return c.Name == "clone" })
s.Equal("alpine/git:2.45.1", cloneContainer.Image)
s.Equal("alpine/git:2.45.2", cloneContainer.Image)
s.Equal([]string{"git", "clone", "--recurse-submodules", cloneURL, "-b", buildBranch, "--verbose", "--progress", git.Workspace}, cloneContainer.Command)
s.Empty(cloneContainer.Args)
// s.Equal([]string{fmt.Sprintf("git clone --recurse-submodules %s -b %s --verbose --progress /workspace", cloneURL, buildBranch)}, cloneContainer.Args)
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/utils/git/clone.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func CloneInitContainersWithContainerName(sshURL, branch, cloneContainerName str
},
{
Name: cloneContainerName,
Image: "alpine/git:2.45.1",
Image: "alpine/git:2.45.2",
ImagePullPolicy: corev1.PullIfNotPresent,
Command: gitCloneCmd,
VolumeMounts: []corev1.VolumeMount{
Expand Down

0 comments on commit 4b48833

Please sign in to comment.