Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add custom tags to created ECR repositories #191

Merged
merged 6 commits into from
Dec 16, 2022
Merged

feat: add custom tags to created ECR repositories #191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50fa35a
feat: add custom tags for ECR object
darkweaver87 Nov 21, 2022
4ed34a1
fix: update the doc
darkweaver87 May 3, 2022
320d4f5
fix: apply CR suggestions
darkweaver87 Nov 21, 2022
5b00b61
apply CR suggestion
darkweaver87 Dec 15, 2022
69c01f2
use config
darkweaver87 Dec 15, 2022
3bbc710
Apply suggestions from code review
darkweaver87 Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: apply CR suggestions
  • Loading branch information
@darkweaver87
darkweaver87 committed Dec 15, 2022
commit 320d4f525fa655a712c438ad35aa5d492ee235b9
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
FROM alpine:3.17.0
RUN ["apk", "add", "--no-cache", "--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community", "skopeo>=1.2.0"]

COPY k8s-image-swapper /
ARG TARGETARCH
COPY k8s-image-swapper-$TARGETARCH /k8s-image-swapper
estahn marked this conversation as resolved.
Show resolved Hide resolved

ENTRYPOINT ["/k8s-image-swapper"]

Expand Down
4 changes: 3 additions & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ A mutating webhook for Kubernetes, pointing the images to a new location.`,
//metricsRec := metrics.NewPrometheus(promReg)
log.Trace().Interface("config", cfg).Msg("config")

rClient, err := registry.NewECRClient(cfg.Target.AWS.Region, cfg.Target.AWS.EcrDomain(), cfg.Target.AWS.AccountID, cfg.Target.AWS.Role, cfg.Target.AWS.AccessPolicy, cfg.Target.AWS.LifecyclePolicy, cfg.RepositoryCustomTags)
rClient, err := registry.NewECRClient(cfg.Target.AWS.Region, cfg.Target.AWS.EcrDomain(), cfg.Target.AWS.AccountID, cfg.Target.AWS.Role, cfg.Target.AWS.AccessPolicy, cfg.Target.AWS.LifecyclePolicy)
if err != nil {
log.Err(err).Msg("error connecting to registry client")
os.Exit(1)
}

rClient.SetRepositoryCustomTags(cfg.RepositoryCustomTags)

imageSwapPolicy, err := types.ParseImageSwapPolicy(cfg.ImageSwapPolicy)
if err != nil {
log.Err(err)
Expand Down
7 changes: 5 additions & 2 deletions pkg/registry/ecr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ func (e *ECRClient) CreateRepository(name string) error {
return nil
}

func (e *ECRClient) SetRepositoryCustomTags(tags []config.CustomTag) {
e.customTags = tags
}

func (e *ECRClient) buildEcrTags() []*ecr.Tag {
ecrTags := []*ecr.Tag{
{
Expand Down Expand Up @@ -196,7 +200,7 @@ func (e *ECRClient) scheduleTokenRenewal() error {
return nil
}

func NewECRClient(region string, ecrDomain string, targetAccount string, role string, accessPolicy string, lifecyclePolicy string, ecrCustomTags []config.CustomTag) (*ECRClient, error) {
func NewECRClient(region string, ecrDomain string, targetAccount string, role string, accessPolicy string, lifecyclePolicy string) (*ECRClient, error) {
var sess *session.Session
var config *aws.Config
if role != "" {
Expand Down Expand Up @@ -245,7 +249,6 @@ func NewECRClient(region string, ecrDomain string, targetAccount string, role st
targetAccount: targetAccount,
accessPolicy: accessPolicy,
lifecyclePolicy: lifecyclePolicy,
customTags: ecrCustomTags,
}

if err := client.scheduleTokenRenewal(); err != nil {
Expand Down