Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump k8s libs to 1.30.x #2649

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ ignore-not-found ?= false

.PHONY: install
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/crd | kubectl apply -f -
$(KUSTOMIZE) build config/crd | kubectl create -f -

.PHONY: uninstall
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
Expand All @@ -320,7 +320,7 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
kubectl create namespace observability 2>&1 | grep -v "already exists" || true
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
./hack/enable-operator-features.sh
$(KUSTOMIZE) build config/default | kubectl apply -f -
$(KUSTOMIZE) build config/default | kubectl create -f -

.PHONY: undeploy
undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
Expand Down
939 changes: 939 additions & 0 deletions bundle/manifests/jaegertracing.io_jaegers.yaml

Large diffs are not rendered by default.

939 changes: 939 additions & 0 deletions config/crd/bases/jaegertracing.io_jaegers.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions controllers/appsv1/deployment_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
var _ webhook.AdmissionHandler = (*deploymentInterceptor)(nil)

// NewDeploymentInterceptorWebhook creates a new deployment mutating webhook to be registered
func NewDeploymentInterceptorWebhook(c client.Client, decoder *admission.Decoder) webhook.AdmissionHandler {
func NewDeploymentInterceptorWebhook(c client.Client, decoder admission.Decoder) webhook.AdmissionHandler {
return &deploymentInterceptor{
client: c,
decoder: decoder,
Expand All @@ -46,7 +46,7 @@
// deploymentInterceptor label pods if Sidecar is specified in deployment
type deploymentInterceptor struct {
client client.Client
decoder *admission.Decoder
decoder admission.Decoder
}

func (d *deploymentInterceptor) shouldHandleDeployment(req admission.Request) bool {
Expand Down Expand Up @@ -174,7 +174,7 @@
// A decoder will be automatically injected.

// InjectDecoder injects the decoder.
func (d *deploymentInterceptor) InjectDecoder(decoder *admission.Decoder) error {
func (d *deploymentInterceptor) InjectDecoder(decoder admission.Decoder) error {

Check warning on line 177 in controllers/appsv1/deployment_webhook.go

View check run for this annotation

Codecov / codecov/patch

controllers/appsv1/deployment_webhook.go#L177

Added line #L177 was not covered by tests
d.decoder = decoder
return nil
}
Expand Down
Loading
Loading