Skip to content

Commit

Permalink
Merge pull request #112 from leanix/release/HEL-1257-6.0.3
Browse files Browse the repository at this point in the history
HEL-1257 Updated version to 6.0.3
  • Loading branch information
DennisBerthold-leanix authored Dec 6, 2021
2 parents 9e2d16e + 3756621 commit 581e11c
Show file tree
Hide file tree
Showing 11 changed files with 485 additions and 110 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# LeanIX Kubernetes Connector Changelog

## Release 2021-12-06 - 6.0.3
* Dependencies have been updated

## Release 2021-11-19 - 6.0.2
* Empty `connectorID` will now use the `clustername` instead of a random uuid.

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT ?= leanix-k8s-connector
DOCKER_NAMESPACE ?= leanixacrpublic.azurecr.io

VERSION := 6.0.2
VERSION := 6.0.3
FULL_VERSION := $(VERSION)-$(shell git describe --tags --always)

IMAGE := $(DOCKER_NAMESPACE)/$(PROJECT):$(VERSION)
Expand All @@ -24,7 +24,7 @@ version:
@echo $(VERSION)

image:
docker build -t $(IMAGE) -t $(FULL_IMAGE) -t $(LATEST) .
docker build --no-cache --pull --rm -t $(IMAGE) -t $(FULL_IMAGE) -t $(LATEST) .

push:
docker push $(IMAGE)
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,8 @@ e.g `--set args.storageBackend=file`

| Release date | Connector version | Integration version | Helm chart version | Container image tag |
| :----------: | :---------------: | :-----------------: | :----------------: | :-----------------: |
| 2021-12-06 | 6.0.3 | 1.0.0 | 6.0.3 | 6.0.3 |
| 2021-12-19 | 6.0.2 | 1.0.0 | 6.0.2 | 6.0.2 |
| 2021-11-18 | 6.0.1 | 1.0.0 | 6.0.1 | 6.0.1 |
| 2021-10-12 | 6.0.0 | 1.0.0 | 6.0.0 | 6.0.0 |
| 2021-09-20 | 5.0.0 | 1.0.0 | 5.0.0 | 5.0.0 |
Expand Down
3 changes: 2 additions & 1 deletion cmd/leanix-k8s-connector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bytes"
"context"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -212,7 +213,7 @@ func main() {
log.Debugf("Not scanning resouce %s", strings.Join([]string{gvr.Group, gvr.Version, gvr.Resource}, "/"))
continue
}
instances, err := dynClient.Resource(gvr).List(metav1.ListOptions{})
instances, err := dynClient.Resource(gvr).List(context.Background(), metav1.ListOptions{})
if err != nil {
log.Panic(err)
}
Expand Down
68 changes: 44 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,54 @@ go 1.17

require (
github.com/Azure/azure-storage-blob-go v0.8.0
github.com/Azure/go-autorest/autorest v0.10.0 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.3.2
github.com/stretchr/testify v1.7.0
k8s.io/api v0.22.4
k8s.io/apimachinery v0.22.4
k8s.io/client-go v0.22.4
)

require (
github.com/Azure/azure-pipeline-go v0.2.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/json-iterator/go v1.1.6 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/magiconair/properties v1.8.0 // indirect
github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.8.0 // indirect
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.3.2
github.com/stretchr/testify v1.3.0
golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0-20190222213804-5cb15d344471
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
k8s.io/client-go v10.0.0+incompatible
k8s.io/klog v0.2.0 // indirect
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading

0 comments on commit 581e11c

Please sign in to comment.