loop over init containers as well #96

asad-awadia · 2021-07-29T18:01:54Z

No description provided.

pkg/webhook/image_swapper.go

estahn

@asad-awadia Thanks again for your contribution. Just some minor changes before I am going to merge it.

estahn · 2021-08-16T04:49:55Z

pkg/webhook/image_swapper.go


-	for i, container := range pod.Spec.Containers {
+	p.replaceContainerImages(lctx, ar, pod, pod.Spec.Containers)


Suggested change

p.replaceContainerImages(lctx, ar, pod, pod.Spec.Containers)

p.processContainers(lctx, ar, pod, pod.Spec.Containers)

estahn · 2021-08-16T04:50:04Z

pkg/webhook/image_swapper.go


-	for i, container := range pod.Spec.Containers {
+	p.replaceContainerImages(lctx, ar, pod, pod.Spec.Containers)
+	p.replaceContainerImages(lctx, ar, pod, pod.Spec.InitContainers)


Suggested change

p.replaceContainerImages(lctx, ar, pod, pod.Spec.InitContainers)

p.processContainers(lctx, ar, pod, pod.Spec.InitContainers)

estahn · 2021-08-16T04:50:17Z

pkg/webhook/image_swapper.go

+	return false, nil
+}
+
+func (p *ImageSwapper) replaceContainerImages(lctx context.Context, ar *v1beta1.AdmissionRequest, pod *corev1.Pod, containers []corev1.Container) {


Suggested change

func (p *ImageSwapper) replaceContainerImages(lctx context.Context, ar *v1beta1.AdmissionRequest, pod *corev1.Pod, containers []corev1.Container) {

func (p *ImageSwapper) processContainers(lctx context.Context, ar *v1beta1.AdmissionRequest, pod *corev1.Pod, containers []corev1.Container) {

asad-awadia · 2021-08-16T14:07:15Z

@estahn pushed

codecov · 2021-08-16T20:50:45Z

Codecov Report

Merging #96 (8c03449) into main (675de88) will decrease coverage by 0.13%.
The diff coverage is 0.00%.

❗ Current head 8c03449 differs from pull request most recent head d1b4e7a. Consider uploading reports for the commit d1b4e7a to get more accurate results

@@            Coverage Diff             @@
##             main      #96      +/-   ##
==========================================
- Coverage   14.81%   14.67%   -0.14%     
==========================================
  Files           2        2              
  Lines         108      109       +1     
==========================================
  Hits           16       16              
- Misses         90       91       +1     
  Partials        2        2

Impacted Files	Coverage Δ
pkg/webhook/image_swapper.go	`14.81% <0.00%> (-0.14%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 675de88...d1b4e7a. Read the comment docs.

estahn · 2021-08-16T20:51:46Z

@asad-awadia CI fails with Error: Error return value of p.processContainers is not checked (errcheck)

If you sync with latest main you should be able to run make test.

asad-awadia · 2021-08-16T20:57:15Z

@estahn yeah - idk what to do with the two returns of process container

we need to return the response from the last one which has the updated pod

asad-awadia · 2021-08-16T21:19:46Z

should I just assign to _ ?

asad-awadia · 2021-08-17T13:59:31Z

Package devmapper was not found in the pkg-config search path.
Perhaps you should add the directory containing `devmapper.pc'
to the PKG_CONFIG_PATH environment variable
No package 'devmapper' found
pkg-config: exit status 1
FAIL    github.com/estahn/k8s-image-swapper/pkg/config [build failed]
FAIL    github.com/estahn/k8s-image-swapper/pkg/webhook [build failed]
Makefile:19: recipe for target 'test' failed
make: *** [test] Error 2

make test doesn't work

estahn · 2021-08-17T14:02:31Z

Package devmapper was not found in the pkg-config search path.
Perhaps you should add the directory containing `devmapper.pc'
to the PKG_CONFIG_PATH environment variable
No package 'devmapper' found
pkg-config: exit status 1
FAIL    github.com/estahn/k8s-image-swapper/pkg/config [build failed]
FAIL    github.com/estahn/k8s-image-swapper/pkg/webhook [build failed]
Makefile:19: recipe for target 'test' failed
make: *** [test] Error 2

make test doesn't work

This says you're missing the devmapper libs. See what to install here:

k8s-image-swapper/.github/workflows/test.yml

Line 18 in 675de88

    
           run: sudo apt-get update && sudo apt-get install -y libdevmapper-dev libbtrfs-dev

asad-awadia · 2021-08-17T14:16:13Z

Package devmapper was not found in the pkg-config search path.
Perhaps you should add the directory containing `devmapper.pc'
to the PKG_CONFIG_PATH environment variable
No package 'devmapper' found
pkg-config: exit status 1
FAIL    github.com/estahn/k8s-image-swapper/pkg/config [build failed]
FAIL    github.com/estahn/k8s-image-swapper/pkg/webhook [build failed]
Makefile:19: recipe for target 'test' failed
make: *** [test] Error 2
make test doesn't work
This says you're missing the devmapper libs. See what to install here:

k8s-image-swapper/.github/workflows/test.yml

Line 18 in 675de88

run: sudo apt-get update && sudo apt-get install -y libdevmapper-dev libbtrfs-dev

Yes - I tried this before too

Err:23 http://ppa.launchpad.net/linuxmint-tr/focalbase/ubuntu bionic Release   
  404  Not Found [IP: 91.189.95.85 80]
Reading package lists... Done                      
E: Failed to fetch http://ppa.launchpad.net/linuxmint-tr/araclar/ubuntu/dists/bionic/InRelease  403  Forbidden [IP: 91.189.95.85 80]
E: The repository 'http://ppa.launchpad.net/linuxmint-tr/araclar/ubuntu bionic InRelease' is no longer signed.
N: Updating from such a repository can't be done securely, and is therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details.
E: The repository 'http://ppa.launchpad.net/linuxmint-tr/focalbase/ubuntu bionic Release' does not have a Release file.
N: Updating from such a repository can't be done securely, and is therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details.

doesn't work either ..

asad-awadia · 2021-08-18T15:00:39Z

@estahn can you run CI again

Adding support for containers in `pod.spec.initContainers`, swapping the image in the same way as `pod.spec.containers`. fixes #73 #96

* feat: Support for pod.spec.initContainers Adding support for containers in `pod.spec.initContainers`, swapping the image in the same way as `pod.spec.containers`. fixes #73 #96

estahn · 2021-10-02T14:14:07Z

@asad-awadia Thanks for your contribution, however, I decided to implement it in a different way. The feature should be available in 1.1.x.

* feat: Support for pod.spec.initContainers Adding support for containers in `pod.spec.initContainers`, swapping the image in the same way as `pod.spec.containers`. fixes #73 #96

# [1.1.0](v1.0.0...v1.1.0) (2021-10-02) ### Bug Fixes * provide log record for ImageSwapPolicyExists ([179da70](179da70)) * timeout for ECR client ([26bdc10](26bdc10)) * **deps:** update module github.com/alitto/pond to v1.5.1 ([504e2dd](504e2dd)) * **deps:** update module github.com/aws/aws-sdk-go to v1.38.47 ([#70](#70)) ([4f30053](4f30053)) * **deps:** update module github.com/aws/aws-sdk-go to v1.40.43 ([266ef01](266ef01)) * **deps:** update module github.com/containers/image/v5 to v5.11.0 ([#61](#61)) ([11d6d28](11d6d28)) * **deps:** update module github.com/containers/image/v5 to v5.16.0 ([5230b91](5230b91)) * **deps:** update module github.com/dgraph-io/ristretto to v0.1.0 ([#82](#82)) ([dff1cb1](dff1cb1)) * **deps:** update module github.com/go-co-op/gocron to v1.9.0 ([c0e9f11](c0e9f11)) * **deps:** update module github.com/rs/zerolog to v1.22.0 ([#76](#76)) ([c098326](c098326)) * **deps:** update module github.com/rs/zerolog to v1.23.0 ([#84](#84)) ([607d5bb](607d5bb)) * **deps:** update module github.com/rs/zerolog to v1.25.0 ([72822f4](72822f4)) * **deps:** update module github.com/slok/kubewebhook to v2 ([8bd73d4](8bd73d4)) * **deps:** update module github.com/spf13/cobra to v1.2.1 ([ea1e787](ea1e787)) * **deps:** update module github.com/spf13/viper to v1.8.1 ([8a055a2](8a055a2)) * **deps:** update module k8s.io/api to v0.22.1 ([ab6d898](ab6d898)) * **deps:** update module k8s.io/apimachinery to v0.21.1 ([#79](#79)) ([aeeeffb](aeeeffb)) * **deps:** update module k8s.io/apimachinery to v0.22.2 ([ef72c66](ef72c66)) ### Features * Support for imagePullSecrets ([#112](#112)) ([2d8cf77](2d8cf77)), closes [#92](#92) [#19](#19) * Support for pod.spec.initContainers ([#118](#118)) ([725ff2c](725ff2c)), closes [#73](#73) [#96](#96)

loop over init containers as well

82240cc

asad-awadia mentioned this pull request Jul 29, 2021

Mutate initContainers #73

Closed

fix container swap

471fb60

lheinlen reviewed Aug 10, 2021

View reviewed changes

pkg/webhook/image_swapper.go Outdated Show resolved Hide resolved

asad-awadia added 2 commits August 10, 2021 17:01

refactor out into function

d6e70ce

change to containers[i]

e3547a1

estahn requested changes Aug 16, 2021

View reviewed changes

asad-awadia added 2 commits August 16, 2021 09:55

rename function

36d4bfc

resolve merge conflict

8c03449

asad-awadia requested a review from estahn August 16, 2021 14:07

estahn linked an issue Aug 16, 2021 that may be closed by this pull request

Mutate initContainers #73

Closed

estahn added this to the 1.1.0 milestone Aug 16, 2021

estahn added the enhancement New feature or request label Aug 16, 2021

estahn assigned estahn and asad-awadia and unassigned estahn Aug 16, 2021

check return

d1b4e7a

estahn added a commit that referenced this pull request Oct 2, 2021

feat: Support for pod.spec.initContainers

aa29b88

Adding support for containers in `pod.spec.initContainers`, swapping the image in the same way as `pod.spec.containers`. fixes #73 #96

estahn mentioned this pull request Oct 2, 2021

feat: Support for pod.spec.initContainers #118

Merged

estahn closed this Oct 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

loop over init containers as well #96

loop over init containers as well #96

asad-awadia commented Jul 29, 2021

estahn left a comment

estahn Aug 16, 2021

estahn Aug 16, 2021

estahn Aug 16, 2021

asad-awadia commented Aug 16, 2021

codecov bot commented Aug 16, 2021 •

edited

Loading

estahn commented Aug 16, 2021 •

edited

Loading

asad-awadia commented Aug 16, 2021

asad-awadia commented Aug 16, 2021

asad-awadia commented Aug 17, 2021

estahn commented Aug 17, 2021

asad-awadia commented Aug 17, 2021

asad-awadia commented Aug 18, 2021

estahn commented Oct 2, 2021


		for i, container := range pod.Spec.Containers {
		p.replaceContainerImages(lctx, ar, pod, pod.Spec.Containers)

	p.replaceContainerImages(lctx, ar, pod, pod.Spec.Containers)
	p.processContainers(lctx, ar, pod, pod.Spec.Containers)

	func (p ImageSwapper) replaceContainerImages(lctx context.Context, ar v1beta1.AdmissionRequest, pod *corev1.Pod, containers []corev1.Container) {
	func (p ImageSwapper) processContainers(lctx context.Context, ar v1beta1.AdmissionRequest, pod *corev1.Pod, containers []corev1.Container) {

loop over init containers as well #96

loop over init containers as well #96

Conversation

asad-awadia commented Jul 29, 2021

estahn left a comment

Choose a reason for hiding this comment

estahn Aug 16, 2021

Choose a reason for hiding this comment

estahn Aug 16, 2021

Choose a reason for hiding this comment

estahn Aug 16, 2021

Choose a reason for hiding this comment

asad-awadia commented Aug 16, 2021

codecov bot commented Aug 16, 2021 • edited Loading

Codecov Report

estahn commented Aug 16, 2021 • edited Loading

asad-awadia commented Aug 16, 2021

asad-awadia commented Aug 16, 2021

asad-awadia commented Aug 17, 2021

estahn commented Aug 17, 2021

asad-awadia commented Aug 17, 2021

asad-awadia commented Aug 18, 2021

estahn commented Oct 2, 2021

codecov bot commented Aug 16, 2021 •

edited

Loading

estahn commented Aug 16, 2021 •

edited

Loading