Skip to content

Commit

Permalink
Make docker deps more specific, fix changes in k8s lib API
Browse files Browse the repository at this point in the history
  • Loading branch information
nabsul committed Jun 3, 2022
1 parent 19d35e6 commit b207df7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# syntax=docker/dockerfile:1
FROM golang:alpine AS build
FROM golang:1.18-alpine AS build
WORKDIR /go/src/app
ADD . /go/src/app
RUN go get -d -v ./...
RUN go build -o /go/bin/app

FROM alpine:latest
FROM alpine:3.16
COPY --from=build /go/bin/app /k8s-ecr-login-renew
CMD ["/k8s-ecr-login-renew"]
11 changes: 6 additions & 5 deletions src/k8s/kubernetes.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package k8s

import (
"context"
"encoding/base64"
"encoding/json"
coreV1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -50,7 +51,7 @@ func getClientConfig() (*rest.Config, error) {
}

func getSecret(client *kubernetes.Clientset, name, namespace string) (*coreV1.Secret, error) {
secret, err := client.CoreV1().Secrets(namespace).Get(name, metaV1.GetOptions{})
secret, err := client.CoreV1().Secrets(namespace).Get(context.TODO(), name, metaV1.GetOptions{})
if nil != err {
if strings.Contains(err.Error(), "not found") {
return nil, nil
Expand Down Expand Up @@ -107,25 +108,25 @@ func UpdatePassword(namespace, name, username, password string, servers []string
if secret == nil {
secret = createSecret(name)
secret.Data[coreV1.DockerConfigJsonKey] = configJson
_, err = client.CoreV1().Secrets(namespace).Create(secret)
_, err = client.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metaV1.CreateOptions{})
return err
}

secret.Data[coreV1.DockerConfigJsonKey] = configJson
_, err = client.CoreV1().Secrets(namespace).Update(secret)
_, err = client.CoreV1().Secrets(namespace).Update(context.TODO(), secret, metaV1.UpdateOptions{})

if err == nil {
return nil
}

// fall back to delete+create in case permissions are not updated
err = client.CoreV1().Secrets(namespace).Delete(name, &metaV1.DeleteOptions{})
err = client.CoreV1().Secrets(namespace).Delete(context.TODO(), name, metaV1.DeleteOptions{})
if err != nil {
return err
}

secret = createSecret(name)
secret.Data[coreV1.DockerConfigJsonKey] = configJson
_, err = client.CoreV1().Secrets(namespace).Create(secret)
_, err = client.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metaV1.CreateOptions{})
return err
}
3 changes: 2 additions & 1 deletion src/k8s/namespaces.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package k8s

import (
"context"
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"regexp"
"strings"
Expand Down Expand Up @@ -126,7 +127,7 @@ func getAllNamespaces() ([]string, error) {

for first || opts.Continue != "" {
first = false
res, err := client.CoreV1().Namespaces().List(opts)
res, err := client.CoreV1().Namespaces().List(context.TODO(), opts)
if nil != err {
return nil, err
}
Expand Down

0 comments on commit b207df7

Please sign in to comment.