Go module, bump versions of k8s libs, rework of the Informer for namespaces (more suitable), rework of secretGenerator

.gitignore

@@ -1,2 +1,10 @@
 registry-creds
-.vscode/
+.vscode/
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

Dockerfile

@@ -1,9 +1,16 @@
-FROM alpine:3.4
-MAINTAINER Steve Sloka <steve@stevesloka.com>
+# Start by building the application.
+FROM golang:1.14-buster as build
 
-RUN apk add --update ca-certificates && \
-  rm -rf /var/cache/apk/*
+WORKDIR /go/src/app
+ADD . /go/src/app/registry-creds
 
-COPY registry-creds registry-creds
+RUN go get -d -v ./...
 
-ENTRYPOINT ["/registry-creds"]
+WORKDIR /go/src/app/registry-creds
+RUN go test
+RUN GOOS=linux GOARCH=amd64 go build -v -ldflags="-w -s" -o /go/bin/app/registry-creds
+
+# Now copy it into our base image.
+FROM gcr.io/distroless/base
+COPY --from=build /go/bin/app/registry-creds /
+CMD ["/registry-creds"]

go.mod

@@ -0,0 +1,20 @@
+module github.com/achoimet/registry-creds
+
+go 1.14
+
+require (
+	github.com/aws/aws-sdk-go v1.34.20
+	github.com/cenkalti/backoff v2.2.1+incompatible
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/googleapis/gnostic v0.5.1 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.6.1
+	golang.org/x/net v0.0.0-20200904194848-62affa334b73
+	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	k8s.io/api v0.19.1
+	k8s.io/apimachinery v0.19.1
+	k8s.io/client-go v0.19.1
+	k8s.io/utils v0.0.0-20200821003339-5e75c0163111 // indirect
+)

k8s/deployment.yaml

@@ -38,46 +38,3 @@ spec:
               secretKeyRef:
                 name: registry-creds-ecr
                 key: aws-region
-          - name: aws_assume_role
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: aws-assume-role
-          - name: DOCKER_PRIVATE_REGISTRY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_PASSWORD
-          - name: DOCKER_PRIVATE_REGISTRY_SERVER
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_SERVER
-          - name: DOCKER_PRIVATE_REGISTRY_USER
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_USER
-          - name: ACR_URL
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-acr
-                key: ACR_URL
-          - name: ACR_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-acr
-                key: ACR_CLIENT_ID
-          - name: ACR_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-acr
-                key: ACR_PASSWORD
-        volumeMounts:
-        - name: gcr-creds
-          mountPath: "/root/.config/gcloud"
-          readOnly: true
-      volumes:
-      - name: gcr-creds
-        secret:
-          secretName: registry-creds-gcr

k8sutil/k8sutil.go → k8sutil.go

@@ -1,14 +1,16 @@
-package k8sutil
+package main
 
 import (
+	"context"
+	v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/informers"
 	"log"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 	coreType "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/pkg/api/v1"
-	"k8s.io/client-go/pkg/fields"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
@@ -19,12 +21,12 @@ type KubeInterface interface {
 	Secrets(namespace string) coreType.SecretInterface
 	Namespaces() coreType.NamespaceInterface
 	ServiceAccounts(namespace string) coreType.ServiceAccountInterface
-	Core() coreType.CoreV1Interface
 }
 
 type K8sutilInterface struct {
-	Kclient    KubeInterface
-	MasterHost string
+	KubernetesClient kubernetes.Interface
+	KubernetesCoreV1 KubeInterface
+	MasterHost       string
 }
 
 // New creates a new instance of k8sutil
@@ -37,14 +39,15 @@ func New(kubeCfgFile, masterHost string) (*K8sutilInterface, error) {
 	}
 
 	k := &K8sutilInterface{
-		Kclient:    client,
-		MasterHost: masterHost,
+		KubernetesClient: client,
+		KubernetesCoreV1: client.CoreV1().(KubeInterface),
+		MasterHost:       masterHost,
 	}
 
 	return k, nil
 }
 
-func newKubeClient(kubeCfgFile string) (KubeInterface, error) {
+func newKubeClient(kubeCfgFile string) (*kubernetes.Clientset, error) {
 
 	var client *kubernetes.Clientset
 
@@ -82,8 +85,8 @@ func newKubeClient(kubeCfgFile string) (KubeInterface, error) {
 }
 
 // GetNamespaces returns all namespaces
-func (k *K8sutilInterface) GetNamespaces() (*v1.NamespaceList, error) {
-	namespaces, err := k.Kclient.Namespaces().List(v1.ListOptions{})
+func (k *K8sutilInterface) GetNamespaces() (*core_v1.NamespaceList, error) {
+	namespaces, err := k.KubernetesCoreV1.Namespaces().List(context.TODO(), v12.ListOptions{})
 	if err != nil {
 		logrus.Error("Error getting namespaces: ", err)
 		return nil, err
@@ -93,8 +96,8 @@ func (k *K8sutilInterface) GetNamespaces() (*v1.NamespaceList, error) {
 }
 
 // GetSecret get a secret
-func (k *K8sutilInterface) GetSecret(namespace, secretname string) (*v1.Secret, error) {
-	secret, err := k.Kclient.Secrets(namespace).Get(secretname)
+func (k *K8sutilInterface) GetSecret(namespace, secretname string) (*core_v1.Secret, error) {
+	secret, err := k.KubernetesCoreV1.Secrets(namespace).Get(context.TODO(), secretname, v12.GetOptions{})
 	if err != nil {
 		logrus.Error("Error getting secret: ", err)
 		return nil, err
@@ -104,8 +107,8 @@ func (k *K8sutilInterface) GetSecret(namespace, secretname string) (*v1.Secret,
 }
 
 // CreateSecret creates a secret
-func (k *K8sutilInterface) CreateSecret(namespace string, secret *v1.Secret) error {
-	_, err := k.Kclient.Secrets(namespace).Create(secret)
+func (k *K8sutilInterface) CreateSecret(namespace string, secret *core_v1.Secret) error {
+	_, err := k.KubernetesCoreV1.Secrets(namespace).Create(context.TODO(), secret, v12.CreateOptions{})
 
 	if err != nil {
 		logrus.Error("Error creating secret: ", err)
@@ -116,8 +119,8 @@ func (k *K8sutilInterface) CreateSecret(namespace string, secret *v1.Secret) err
 }
 
 // UpdateSecret updates a secret
-func (k *K8sutilInterface) UpdateSecret(namespace string, secret *v1.Secret) error {
-	_, err := k.Kclient.Secrets(namespace).Update(secret)
+func (k *K8sutilInterface) UpdateSecret(namespace string, secret *core_v1.Secret) error {
+	_, err := k.KubernetesCoreV1.Secrets(namespace).Update(context.TODO(), secret, v12.UpdateOptions{})
 
 	if err != nil {
 		logrus.Error("Error updating secret: ", err)
@@ -128,8 +131,8 @@ func (k *K8sutilInterface) UpdateSecret(namespace string, secret *v1.Secret) err
 }
 
 // GetServiceAccount updates a secret
-func (k *K8sutilInterface) GetServiceAccount(namespace, name string) (*v1.ServiceAccount, error) {
-	sa, err := k.Kclient.ServiceAccounts(namespace).Get(name)
+func (k *K8sutilInterface) GetServiceAccount(namespace, name string) (*core_v1.ServiceAccount, error) {
+	sa, err := k.KubernetesCoreV1.ServiceAccounts(namespace).Get(context.TODO(), name, v12.GetOptions{})
 
 	if err != nil {
 		logrus.Error("Error getting service account: ", err)
@@ -140,8 +143,8 @@ func (k *K8sutilInterface) GetServiceAccount(namespace, name string) (*v1.Servic
 }
 
 // UpdateServiceAccount updates a secret
-func (k *K8sutilInterface) UpdateServiceAccount(namespace string, sa *v1.ServiceAccount) error {
-	_, err := k.Kclient.ServiceAccounts(namespace).Update(sa)
+func (k *K8sutilInterface) UpdateServiceAccount(namespace string, sa *core_v1.ServiceAccount) error {
+	_, err := k.KubernetesCoreV1.ServiceAccounts(namespace).Update(context.TODO(), sa, v12.UpdateOptions{})
 
 	if err != nil {
 		logrus.Error("Error updating service account: ", err)
@@ -151,24 +154,22 @@ func (k *K8sutilInterface) UpdateServiceAccount(namespace string, sa *v1.Service
 	return nil
 }
 
-func (k *K8sutilInterface) WatchNamespaces(resyncPeriod time.Duration, handler func(*v1.Namespace) error) {
+func (k *K8sutilInterface) WatchNamespaces(resyncPeriod time.Duration, handler func(*core_v1.Namespace) error) {
+	factory := informers.NewSharedInformerFactory(k.KubernetesClient, resyncPeriod)
+	informer := factory.Core().V1().Namespaces().Informer()
 	stopC := make(chan struct{})
-	_, c := cache.NewInformer(
-		cache.NewListWatchFromClient(k.Kclient.Core().RESTClient(), "namespaces", v1.NamespaceAll, fields.Everything()),
-		&v1.Namespace{},
-		resyncPeriod,
-		cache.ResourceEventHandlerFuncs{
-			AddFunc: func(obj interface{}) {
-				if err := handler(obj.(*v1.Namespace)); err != nil {
-					log.Println(err)
-				}
-			},
-			UpdateFunc: func(_ interface{}, obj interface{}) {
-				if err := handler(obj.(*v1.Namespace)); err != nil {
-					log.Println(err)
-				}
-			},
+	defer close(stopC)
+	informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc: func(obj interface{}) {
+			if err := handler(obj.(*core_v1.Namespace)); err != nil {
+				log.Println(err)
+			}
 		},
-	)
-	c.Run(stopC)
+		UpdateFunc: func(_ interface{}, obj interface{}) {
+			if err := handler(obj.(*core_v1.Namespace)); err != nil {
+				log.Println(err)
+			}
+		},
+	})
+	informer.Run(stopC)
 }