Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 as build
FROM golang:1.23 AS build
RUN apt-get update && apt-get install -y curl make

# https://github.com/kubernetes-sigs/aws-iam-authenticator/releases
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY:all run linux docker generate tidy protobuf cover docker-push
.PHONY:all run linux docker docker-build generate tidy protobuf cover docker-push

all:
go get ./pkg/...
Expand All @@ -19,10 +19,13 @@ goreleaser:
fi

docker-snapshot: goreleaser
$(GOPATH)/bin/goreleaser release --snapshot --rm-dist
$(GOPATH)/bin/goreleaser release --snapshot --clean

docker-build:
docker build -t salesforce/sloop:latest .

docker: goreleaser
$(GOPATH)/bin/goreleaser release --rm-dist --skip-publish
$(GOPATH)/bin/goreleaser release --clean --skip-publish

generate:
go generate ./pkg/...
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ Other makefile targets:
To run from Docker you need to host mount your kubeconfig:

```shell script
make docker-snapshot
docker run --rm -it -p 8080:8080 -v ~/.kube/:/kube/ -e KUBECONFIG=/kube/config sloop
make docker-build
docker run --rm -it -p 8080:8080 -v ~/.kube/:/kube/ -e KUBECONFIG=/kube/config salesforce/sloop:latest
```

In this mode, data is written to a memory-backed volume and is discarded after each run. To preserve the data, you can host-mount /data with something like `-v /data/:/some_path_on_host/`
Expand Down
1 change: 0 additions & 1 deletion pkg/sloop/common/logging.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

package common

import "github.com/golang/glog"
Expand Down
4 changes: 4 additions & 0 deletions pkg/sloop/ingress/kubeclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ func MakeKubernetesClient(masterURL string, kubeContext string, privilegedAccess
if privilegedAccess {
clientConfig := getConfig(masterURL, kubeContext)
config, err = ClientConfig(clientConfig)
if err != nil {
glog.Errorf("Cannot create config from client config: %v", err)
return nil, err
}
glog.Infof("Building k8sclient with context=%v, masterURL=%v, configFile=%v.", kubeContext, config.Host, clientConfig.ConfigAccess().GetLoadingPrecedence())
} else {
glog.Infof("Creating Config using BuildConfigFromFlags")
Expand Down