Skip to content

Commit

Permalink
Add VadlidatingAdmissionPolicy RBAC and bump k8s to v1.30 release (#3564
Browse files Browse the repository at this point in the history
)

* Add VadlidatingAdmissionPolicy RBAC and bump k8s to v1.30 release

This changeset adds necessary VadlidatingAdmissionPolicy RBACs
for Tigera apiserver and bumps k8s dependency to v1.30 release.

* Regenerate CRD yaml files

* Fix static-check errors

* Sync ECK Operator CRDs from Calico Enterprise
  • Loading branch information
hjiawei authored Oct 25, 2024
1 parent 2d22f1a commit 60b5624
Show file tree
Hide file tree
Showing 35 changed files with 1,837 additions and 1,822 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ endif

PACKAGE_NAME?=github.com/tigera/operator
LOCAL_USER_ID?=$(shell id -u $$USER)
GO_BUILD_VER?=v0.93
GO_BUILD_VER?=v0.94
CALICO_BUILD?=calico/go-build:$(GO_BUILD_VER)-$(BUILDARCH)
SRC_FILES=$(shell find ./pkg -name '*.go')
SRC_FILES+=$(shell find ./api -name '*.go')
Expand Down
4 changes: 2 additions & 2 deletions api/v1/monitor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ type Endpoint struct {
HonorTimestamps *bool `json:"honorTimestamps,omitempty"`

// MetricRelabelConfigs to apply to samples before ingestion.
MetricRelabelConfigs []*v1.RelabelConfig `json:"metricRelabelings,omitempty"`
MetricRelabelConfigs []v1.RelabelConfig `json:"metricRelabelings,omitempty"`

// RelabelConfigs to apply to samples before scraping.
// Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
// The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
// More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
RelabelConfigs []*v1.RelabelConfig `json:"relabelings,omitempty"`
RelabelConfigs []v1.RelabelConfig `json:"relabelings,omitempty"`
}

// MonitorStatus defines the observed state of Tigera monitor.
Expand Down
16 changes: 4 additions & 12 deletions api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 39 additions & 38 deletions deploy/crds/elastic/agent-crd.yaml

Large diffs are not rendered by default.

91 changes: 42 additions & 49 deletions deploy/crds/elastic/apmserver-crd.yaml

Large diffs are not rendered by default.

98 changes: 78 additions & 20 deletions deploy/crds/elastic/beat-crd.yaml

Large diffs are not rendered by default.

57 changes: 27 additions & 30 deletions deploy/crds/elastic/elasticmapsservers.yaml

Large diffs are not rendered by default.

375 changes: 270 additions & 105 deletions deploy/crds/elastic/elasticsearch-crd.yaml

Large diffs are not rendered by default.

92 changes: 43 additions & 49 deletions deploy/crds/elastic/enterprisesearch-crd.yaml

Large diffs are not rendered by default.

114 changes: 54 additions & 60 deletions deploy/crds/elastic/kibana-crd.yaml

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,116 +1,116 @@
module github.com/tigera/operator

go 1.22.0
go 1.22.3

toolchain go1.23.2

require (
github.com/aws/aws-sdk-go v1.51.9
github.com/aws/aws-sdk-go v1.55.5
github.com/cloudflare/cfssl v1.6.5
github.com/containernetworking/cni v1.0.1
github.com/elastic/cloud-on-k8s/v2 v2.9.0
github.com/containernetworking/cni v1.2.3
github.com/elastic/cloud-on-k8s/v2 v2.14.0
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-logr/logr v1.3.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-version v1.2.1
github.com/hashicorp/go-version v1.7.0
github.com/olivere/elastic/v7 v7.0.32
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.29.0
github.com/openshift/api v0.0.0-20210623185703-9958693a7597
github.com/openshift/library-go v0.0.0-20200924151131-575c4875cdbe
github.com/onsi/gomega v1.34.2
github.com/openshift/api v0.0.0-20240924220842-3c700b6cb32b
github.com/openshift/library-go v0.0.0-20240930172803-190f286b06b1
github.com/pkg/errors v0.9.1
github.com/projectcalico/api v0.0.0-20220722155641-439a754a988b
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.62.0
github.com/projectcalico/api v0.0.0-20240708202104-e3f70b269c2c
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
github.com/r3labs/diff/v2 v2.15.1
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/tigera/api v0.0.0-20230406222214-ca74195900cb
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.22.0
golang.org/x/net v0.24.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.28.0
golang.org/x/net v0.30.0
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.29.9
k8s.io/apiextensions-apiserver v0.29.9
k8s.io/apimachinery v0.29.9
k8s.io/apiserver v0.29.9
k8s.io/client-go v0.29.9
k8s.io/kube-aggregator v0.29.9
sigs.k8s.io/controller-runtime v0.15.3
sigs.k8s.io/kind v0.17.0 // Do not remove, not used by code but used by build
sigs.k8s.io/yaml v1.3.0
k8s.io/api v0.30.5
k8s.io/apiextensions-apiserver v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/apiserver v0.30.5
k8s.io/client-go v0.30.5
k8s.io/kube-aggregator v0.30.5
sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/kind v0.24.0 // Do not remove, not used by code but used by build
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/alessio/shellescape v1.4.2 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-ucfg v0.8.6 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/elastic/go-sysinfo v1.13.1 // indirect
github.com/elastic/go-ucfg v0.8.8 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
go.elastic.co/apm/module/apmzap/v2 v2.4.3 // indirect
go.elastic.co/apm/v2 v2.4.3 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect
go.elastic.co/apm/v2 v2.6.0 // indirect
go.elastic.co/fastjson v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/component-base v0.29.9 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Expand Down
Loading

0 comments on commit 60b5624

Please sign in to comment.