Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/solo-io/skv2 into puertomontt…
Browse files Browse the repository at this point in the history
…/exclude-descriptions-in-schema
  • Loading branch information
puertomontt committed Sep 11, 2024
2 parents 8e242cf + 6b43ed3 commit 9c70bf0
Show file tree
Hide file tree
Showing 64 changed files with 2,278 additions and 808 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:
uses: helm/[email protected]
with:
install_only: true
version: v0.17.0
version: v0.24.0
- name: Setup Kind
run: |
./ci/setup-kind.sh skv2-test-remote
- uses: azure/setup-kubectl@v3
with:
version: 'v1.24.7'
version: 'v1.31.0'
- name: Install deps for codegen
run: |
make install-tools
Expand Down
21 changes: 15 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ install-go-tools: mod-download
go install github.com/golang/mock/[email protected]
go install github.com/onsi/ginkgo/v2/[email protected]
go install golang.org/x/tools/cmd/goimports
go install sigs.k8s.io/kind/cmd/[email protected]

# proto compiler installation
PROTOC_VERSION:=3.15.8
Expand Down Expand Up @@ -58,7 +59,7 @@ generated-code: install-tools update-licenses
go run api/generate.go
# the api/generate.go command is separated out to enable us to run go generate on the generated files (used for mockgen)
# this re-gens test protos
PATH=$(DEPSGOBIN):$(PATH) go test ./codegen
go test ./codegen
go generate -v ./...
$(DEPSGOBIN)/goimports -w .
go mod tidy
Expand All @@ -74,18 +75,26 @@ generate-changelog:
# set TEST_PKG to run a specific test package
.PHONY: run-tests
run-tests:
PATH=$(DEPSGOBIN):$$PATH ginkgo -r -failFast -trace -progress \
-progress \
PATH=$(DEPSGOBIN):$$PATH ginkgo -r --fail-fast -trace \
--show-node-events \
-compilers=4 \
-skipPackage=$(SKIP_PACKAGES) $(TEST_PKG) \
$(GINKGO_FLAGS) \
--skip-package=$(SKIP_PACKAGES) $(TEST_PKG) \
-failOnPending \
-randomizeAllSpecs \
-randomizeSuites \
-keepGoing
$(DEPSGOBIN)/goimports -w .

run-test:
PATH=$(DEPSGOBIN):$$PATH ginkgo $(GINKGO_FLAGS) $(TEST_PKG)
test-clusters:
@kind create cluster --name skv2-test-master 2> /dev/null || true
@kind create cluster --name skv2-test-remote 2> /dev/null || true

# CI workflow for running tests
run-all: REMOTE_CLUSTER_CONTEXT ?= kind-skv2-test-remote
run-all: test-clusters
@go test ./...
@goimports -w .

#----------------------------------------------------------------------------------
# Third Party License Management
Expand Down
7 changes: 7 additions & 0 deletions changelog/v0.40.5/allow_ignored_kube_markers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
- type: NEW_FEATURE
issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/18119
resolvesIssue: false
description: |
Allows the user to define one or more kube markers to ignore. This is useful when using protos that contain
unsupported kubebuilder decorators.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
changelog:
- type: NEW_FEATURE
issueLink: https://github.com/solo-io/gloo/issues/5034
resolvesIssue: false
description: |
Adds the ability to render deployments templates with a reference global floatingUserId field. This field is used to globally unset
the runAsUser field in container securityContexts (like the painter's floatingUserId) and supresses the rendering of the
pod's securityContext. This feature is enabled by setting the GlobalFloatingUserIdPath in the Operator to the path of the global field,
and defaults to an empty string.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changelog:
- type: NEW_FEATURE
description: "If namespacedRbac.namespaces is an empty list but namespacedRbac.resources is not, we will use a sane default of the Release.Namespace instead of ignoring the namespacedRbac.resources input."
issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/15739
5 changes: 5 additions & 0 deletions changelog/v0.40.6/deployment-overrides-docs-change.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
changelog:
- type: NON_USER_FACING
description: >
"Change the helm docs description for deploymentOverrides."
skipCI: "false"
6 changes: 6 additions & 0 deletions changelog/v0.40.7/issue-582.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changelog:
- type: NEW_FEATURE
issueLink: https://github.com/solo-io/skv2/issues/582
description: >
Support extraVolumes/extraVolumeMounts fields which can be passed in by the user from helm values.
skipCI: "false"
92 changes: 92 additions & 0 deletions changelog/v0.41.0/go-1.23-k8s-1.31.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
changelog:
- type: BREAKING_CHANGE
description: "Bump dependencies to support Kubernetes 1.31"
issueLink: https://github.com/solo-io/gloo/issues/9683
- type: DEPENDENCY_BUMP
dependencyOwner: BurntSushi
dependencyRepo: toml
dependencyTag: v1.3.2
- type: DEPENDENCY_BUMP
dependencyOwner: Masterminds
dependencyRepo: sprig
dependencyTag: v3.2.3
- type: DEPENDENCY_BUMP
dependencyOwner: go-logr
dependencyRepo: logr
dependencyTag: v1.4.2
- type: DEPENDENCY_BUMP
dependencyOwner: grafana
dependencyRepo: pyroscope-go
dependencyTag: v0.1.8
- type: DEPENDENCY_BUMP
dependencyOwner: hashicorp
dependencyRepo: go-multierror
dependencyTag: v1.1.1
- type: DEPENDENCY_BUMP
dependencyOwner: onsi
dependencyRepo: gomega
dependencyTag: v2.19.0
- type: DEPENDENCY_BUMP
dependencyOwner: onsi
dependencyRepo: gomega
dependencyTag: v1.33.1
- type: DEPENDENCY_BUMP
dependencyOwner: prometheus
dependencyRepo: client_golang
dependencyTag: v1.19.1
- type: DEPENDENCY_BUMP
dependencyOwner: sirupsen
dependencyRepo: logrus
dependencyTag: v1.9.3
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: go-utils
dependencyTag: v0.26.0
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: k8s-utils
dependencyTag: v0.8.0
- type: DEPENDENCY_BUMP
dependencyOwner: golang
dependencyRepo: x/exp
dependencyTag: v0.0.0-20230515195305-f3d0a9c9a5cc
- type: DEPENDENCY_BUMP
dependencyOwner: golang
dependencyRepo: x/tools
dependencyTag: v0.22.0
- type: DEPENDENCY_BUMP
dependencyOwner: google
dependencyRepo: protobuf
dependencyTag: v1.34.2
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: api
dependencyTag: v0.31.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apiextensions-apiserver
dependencyTag: v0.31.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apimachinery
dependencyTag: v0.31.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: client-go
dependencyTag: v0.31.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: code-generator
dependencyTag: v0.31.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: klog
dependencyTag: v2.130.1
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: utils
dependencyTag: v0.0.0-20240711033017-18e509b52bc8
- type: DEPENDENCY_BUMP
dependencyOwner: sigs.k8s.io
dependencyRepo: controller-runtime
dependencyTag: v0.19.0
47 changes: 24 additions & 23 deletions ci/oss_compliance/osa_provided.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Name|Version|License
---|---|---
[perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License
[xxhash/v2](https://github.com/cespare/xxhash)|v2.2.0|MIT License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.1|ISC License
[xxhash/v2](https://github.com/cespare/xxhash)|v2.3.0|MIT License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.2-0.20180830191138-d8f796af33cc|ISC License
[v3/log](https://github.com/emicklei/go-restful)|v3.11.0|MIT License
[internal/json](https://github.com/evanphx/json-patch)|v5.9.0|BSD 3-clause "New" or "Revised" License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
[go-logr/logr](https://github.com/go-logr/logr)|v1.4.1|Apache License 2.0
[cbor/v2](https://github.com/fxamacker/cbor)|v2.7.0|MIT License
[go-logr/logr](https://github.com/go-logr/logr)|v1.4.2|Apache License 2.0
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.20.2|Apache License 2.0
[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.2|Apache License 2.0
[go-openapi/swag](https://github.com/go-openapi/swag)|v0.22.8|Apache License 2.0
Expand All @@ -16,42 +17,42 @@ Name|Version|License
[google/gnostic-models](https://github.com/google/gnostic-models)|v0.6.8|Apache License 2.0
[cmp/internal](https://github.com/google/go-cmp)|v0.6.0|BSD 3-clause "New" or "Revised" License
[gofuzz/bytesource](https://github.com/google/gofuzz)|v1.2.0|Apache License 2.0
[google/uuid](https://github.com/google/uuid)|v1.3.0|BSD 3-clause "New" or "Revised" License
[pyroscope-go/godeltaprof](https://github.com/grafana/pyroscope-go)|v0.1.6|Apache License 2.0
[google/uuid](https://github.com/google/uuid)|v1.6.0|BSD 3-clause "New" or "Revised" License
[pyroscope-go/godeltaprof](https://github.com/grafana/pyroscope-go)|v0.1.8|Apache License 2.0
[josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License
[json-iterator/go](https://github.com/json-iterator/go)|v1.1.12|MIT License
[klauspost/compress](https://github.com/klauspost/compress)|v1.17.3|Apache License 2.0
[klauspost/compress](https://github.com/klauspost/compress)|v1.17.8|Apache License 2.0
[mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.7|MIT License
[v2/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v2.0.0|Apache License 2.0
[modern-go/concurrent](https://github.com/modern-go/concurrent)|v0.0.0-20180306012644-bacd9c7ef1dd|Apache License 2.0
[modern-go/reflect2](https://github.com/modern-go/reflect2)|v1.0.2|Apache License 2.0
[munnerz/goautoneg](https://github.com/munnerz/goautoneg)|v0.0.0-20191010083416-a7dc8b61c822|BSD 3-clause "New" or "Revised" License
[pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.18.0|Apache License 2.0
[client_model/go](https://github.com/prometheus/client_model)|v0.5.0|Apache License 2.0
[prometheus/common](https://github.com/prometheus/common)|v0.45.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.12.0|Apache License 2.0
[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.19.1|Apache License 2.0
[client_model/go](https://github.com/prometheus/client_model)|v0.6.1|Apache License 2.0
[prometheus/common](https://github.com/prometheus/common)|v0.55.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.15.1|Apache License 2.0
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License
[x448/float16](https://github.com/x448/float16)|v0.8.4|MIT License
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.26.0|MIT License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.23.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.12.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.18.0|BSD 3-clause "New" or "Revised" License
[x/text](https://golang.org/x/text)|v0.14.0|BSD 3-clause "New" or "Revised" License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20230515195305-f3d0a9c9a5cc|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.26.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.21.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.23.0|BSD 3-clause "New" or "Revised" License
[x/text](https://golang.org/x/text)|v0.17.0|BSD 3-clause "New" or "Revised" License
[time/rate](https://golang.org/x/time/rate)|v0.3.0|BSD 3-clause "New" or "Revised" License
[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.4.0|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.33.0|BSD 3-clause "New" or "Revised" License
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.34.2|BSD 3-clause "New" or "Revised" License
[gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
[gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License
[k8s.io/api](https://k8s.io/api)|v0.30.0|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.30.0|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.30.0|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.120.1|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.31.0|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.31.0|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.31.0|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.130.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20240228011516-70dd3763d340|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20230726121419-3b25d923346b|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.18.2|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.19.0|Apache License 2.0
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20221116044647-bc3834ca7abd|Apache License 2.0
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.4.1|Apache License 2.0
[yaml/goyaml.v2](https://sigs.k8s.io/yaml/goyaml.v2)|v1.4.0|Apache License 2.0
Expand Down
Loading

0 comments on commit 9c70bf0

Please sign in to comment.