remove jaeger agent

.github/workflows/e2e.yaml

@@ -31,7 +31,6 @@ jobs:
          - { name: "examples", label: "Examples" }
          - { name: "generate", label: "Generate" }
          - { name: "miscellaneous", label: "Miscellaneous" }
-         - { name: "sidecar", label: "Sidecar" }
          - { name: "streaming", label: "Streaming" }
          - { name: "ui", label: "UI" }
          - { name: "upgrade", label: "Upgrade" }

apis/v1/jaeger_types.go

@@ -508,7 +508,7 @@ type JaegerIngesterSpec struct {
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 }
 
-// JaegerAgentSpec defines the options to be used when deploying the agent
+// JaegerAgentSpec is deprecated and disabled.
 type JaegerAgentSpec struct {
 	// Strategy can be either 'DaemonSet' or 'Sidecar' (default)
 	// +optional

apis/v1/jaeger_webhook.go

@@ -48,7 +48,6 @@
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (j *Jaeger) Default() {
 	jaegerlog.Info("default", "name", j.Name)
-	jaegerlog.Info("WARNING jaeger-agent is deprecated and will removed in v1.55.0. See https://github.com/jaegertracing/jaeger/issues/4739", "component", "agent")
 
 	if j.Spec.Storage.Elasticsearch.Name == "" {
 		j.Spec.Storage.Elasticsearch.Name = defaultElasticsearchName
@@ -97,6 +96,10 @@
 func (j *Jaeger) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) {
 	jaegerlog.Info("validate update", "name", j.Name)
 
+	if len(j.Spec.Agent.Options.opts) != 0 {
+		return nil, fmt.Errorf("Jaeger agent configuration is no longer supported. See https://github.com/jaegertracing/jaeger/issues/4739. Values: %+v", j.Spec.Agent.Options.opts)
+	}
+
 	if ShouldInjectOpenShiftElasticsearchConfiguration(j.Spec.Storage) && j.Spec.Storage.Elasticsearch.DoNotProvision {
 		// check if ES instance exists
 		es := &esv1.Elasticsearch{}

bundle/manifests/jaeger-operator.clusterserviceversion.yaml

@@ -134,26 +134,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - apps
-          resources:
-          - deployments
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - apps
-          resources:
-          - deployments/status
-          verbs:
-          - get
-          - patch
-          - update
         - apiGroups:
           - autoscaling
           resources:
@@ -218,26 +198,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces/status
-          verbs:
-          - get
-          - patch
-          - update
         - apiGroups:
           - extensions
           resources:
@@ -533,32 +493,6 @@ spec:
       name: jaeger-operator
   version: 1.57.0
   webhookdefinitions:
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: jaeger-operator
-    failurePolicy: Ignore
-    generateName: deployment.sidecar-injector.jaegertracing.io
-    objectSelector:
-      matchExpressions:
-      - key: name
-        operator: NotIn
-        values:
-        - jaeger-operator
-    rules:
-    - apiGroups:
-      - apps
-      apiVersions:
-      - v1
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - deployments
-    sideEffects: None
-    targetPort: 9443
-    type: MutatingAdmissionWebhook
-    webhookPath: /mutate-v1-deployment
   - admissionReviewVersions:
     - v1
     containerPort: 443

config/rbac/role.yaml

@@ -19,26 +19,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - autoscaling
   resources:
@@ -103,26 +83,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - extensions
   resources:

config/webhook/kustomization.yaml

@@ -8,4 +8,4 @@ configurations:
 - kustomizeconfig.yaml
 
 patchesStrategicMerge:
-  - deployment_inject_patch.yaml
+  - remove_deployment_webhook_patch.yaml

config/webhook/manifests.yaml

@@ -24,26 +24,6 @@ webhooks:
     resources:
     - jaegers
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-v1-deployment
-  failurePolicy: Ignore
-  name: deployment.sidecar-injector.jaegertracing.io
-  rules:
-  - apiGroups:
-    - apps
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - deployments
-  sideEffects: None
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration

config/webhook/remove_deployment_webhook_patch.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: mutating-webhook-configuration
+webhooks:
+- name: deployment.sidecar-injector.jaegertracing.io
+  $patch: delete