Skip to content

Commit

Permalink
Merge branch 'feat/dex-sql' of https://github.com/cloudoperators/gree…
Browse files Browse the repository at this point in the history 
…nhouse into feat/dex-sql
  • Loading branch information
@kengou
kengou committed Jan 9, 2025
2 parents b2edebf + 274eaa1 commit 5a93642
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 114 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-e2e-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ jobs:

# Create the admin cluster with latest kubernetes version
- name: Create Admin Cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0
with:
cluster_name: ${{ env.ADMIN_CLUSTER }}
node_image: 'kindest/node:v1.31.0'

# Create the remote cluster with kubernetes version from the matrix
- name: Create Remote Cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0
with:
node_image: 'kindest/node:${{ matrix.k8s-version }}'
cluster_name: ${{ env.REMOTE_CLUSTER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
contents: write # Only used when `apply_header: true` else the permission is `read` see: https://github.com/cloudoperators/common/blob/8f15c13b6f4c1631c7e6f6dff5c3300452e9b5b6/.github/workflows/shared-license.yaml#L21-L22
uses: cloudoperators/common/.github/workflows/shared-license.yaml@main
secrets:
github_token: ${{ secrets.CLOUOPERATOR_REPO_WRITE }}
pas: ${{ secrets.CLOUOPERATOR_REPO_WRITE }}
4 changes: 2 additions & 2 deletions Dockerfile.dev-env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ RUN --mount=type=cache,target=/go/pkg/mod \
&& cp $(/workspace/bin/setup-envtest use ${ENVTEST_K8S_VERSION} -p path)/* /usr/local/bin

# Get PluginDefinitions from https://github.com/cloudoperators/greenhouse-extensions
FROM alpine/git:2.45.2 AS git
FROM alpine/git:v2.47.1 AS git
RUN git clone https://github.com/cloudoperators/greenhouse-extensions.git /greenhouse-extensions

# final image
FROM --platform=${BUILDPLATFORM:-linux/amd64} alpine:3.20.3
FROM --platform=${BUILDPLATFORM:-linux/amd64} alpine:3.21.2
LABEL source_repository="https://github.com/cloudoperators/greenhouse"
ENV KUBEBUILDER_ASSETS=/usr/local/bin
WORKDIR /
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ HELMIFY ?= $(LOCALBIN)/helmify
## Tool Versions
KUSTOMIZE_VERSION ?= 5.5.0
CONTROLLER_TOOLS_VERSION ?= 0.16.5
GOLINT_VERSION ?= 1.62.0
GINKGOLINTER_VERSION ?= 0.18.3
GOLINT_VERSION ?= 1.63.4
GINKGOLINTER_VERSION ?= 0.18.4
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION ?= 1.31.0

Expand Down
78 changes: 39 additions & 39 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ replace (
github.com/dexidp/dex => github.com/dexidp/dex v0.0.0-20240807174518-43956db7fd75
github.com/dexidp/dex/api/v2 => github.com/dexidp/dex/api/v2 v2.2.0
// Keep k8s dependencies in sync.
k8s.io/api => k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.2
k8s.io/client-go => k8s.io/client-go v0.31.2
k8s.io/component-base => k8s.io/component-base v0.31.2
k8s.io/kubectl => k8s.io/kubectl v0.31.2
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.1
k8s.io/api => k8s.io/api v0.31.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.4
k8s.io/apimachinery => k8s.io/apimachinery v0.31.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.4
k8s.io/client-go => k8s.io/client-go v0.31.4
k8s.io/component-base => k8s.io/component-base v0.31.4
k8s.io/kubectl => k8s.io/kubectl v0.31.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.3
)

require (
Expand All @@ -24,30 +24,30 @@ require (
github.com/go-jose/go-jose/v4 v4.0.4
github.com/jeremywohl/flatten/v2 v2.0.0-20211013061545-07e4a09fb8e4
github.com/oklog/run v1.1.1-0.20240127200640-eee6e044b77c
github.com/onsi/ginkgo/v2 v2.22.0
github.com/onsi/gomega v1.35.1
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.20.5
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.10.0
github.com/vladimirvivien/gexe v0.4.0
github.com/wI2L/jsondiff v0.6.0
github.com/vladimirvivien/gexe v0.4.1
github.com/wI2L/jsondiff v0.6.1
go.uber.org/zap v1.27.0
golang.org/x/text v0.20.0
golang.org/x/text v0.21.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.15.4
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.3
k8s.io/cli-runtime v0.31.2
k8s.io/client-go v0.31.2
k8s.io/kubectl v0.31.2
helm.sh/helm/v3 v3.16.4
k8s.io/api v0.31.4
k8s.io/apiextensions-apiserver v0.31.4
k8s.io/apimachinery v0.31.4
k8s.io/cli-runtime v0.31.4
k8s.io/client-go v0.31.4
k8s.io/kubectl v0.31.4
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/controller-runtime v0.19.3
sigs.k8s.io/e2e-framework v0.5.0
sigs.k8s.io/kind v0.25.0
sigs.k8s.io/kind v0.26.0
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -58,7 +58,7 @@ require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Microsoft/hcsshim v0.12.6 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
Expand All @@ -74,10 +74,11 @@ require (
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/otiai10/mint v1.6.3 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tidwall/gjson v1.17.3 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
Expand Down Expand Up @@ -106,9 +107,9 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/containerd/containerd v1.7.21 // indirect
github.com/containerd/containerd v1.7.23 // indirect
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dexidp/dex/api/v2 v2.1.1-0.20240807174518-43956db7fd75 // indirect
github.com/docker/cli v27.2.0+incompatible // indirect
Expand All @@ -123,7 +124,6 @@ require (
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
Expand All @@ -141,7 +141,7 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -182,7 +182,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/otiai10/copy v1.14.0
github.com/otiai10/copy v1.14.1
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
Expand All @@ -203,24 +203,24 @@ require (
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/time v0.8.0
golang.org/x/tools v0.26.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/time v0.9.0
golang.org/x/tools v0.28.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.195.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/grpc v1.66.3 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiserver v0.31.2 // indirect
k8s.io/component-base v0.31.2 // indirect
k8s.io/apiserver v0.31.4 // indirect
k8s.io/component-base v0.31.4 // indirect
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
oras.land/oras-go v1.2.6 // indirect
Expand Down
Loading

0 comments on commit 5a93642

Please sign in to comment.