Merge pull request jaegertracing#24 from IshwarKanse/rebase-bot-main

Merge https://github.com/jaegertracing/jaeger-operator:main (4311d7d) into main
IshwarKanse · Jun 18, 2024 · f7079bc · f7079bc
2 parents c97ac7a + 7a68057
commit f7079bc
Show file tree

Hide file tree

Showing 92 changed files with 39 additions and 4,481 deletions.
diff --git a/.github/workflows/base-checks.yaml b/.github/workflows/base-checks.yaml
@@ -20,7 +20,7 @@ jobs:
       USER: jaegertracing
     steps:
     - name: Check out code into the Go module directory
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Set up Go
       uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -37,6 +37,6 @@ jobs:
       run: make install-tools ci
 
     - name: "upload test coverage report"
-      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: "Set up Go"
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -31,13 +31,12 @@ 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" }
     steps:
       - name: "Check out code into the Go module directory"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
       - name: "Set up Go"

diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
@@ -15,7 +15,7 @@ jobs:
     env:
       USER: jaegertracing
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
     - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
     - name: "publishes the images"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
       with:
         go-version: "1.21"
 
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: "install kubebuilder"
       run: ./hack/install/install-kubebuilder.sh

diff --git a/.github/workflows/sdk-scorecard.yaml b/.github/workflows/sdk-scorecard.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check out code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: "Install KIND"
         run: ./hack/install/install-kind.sh
       - name: "Install KUTTL"

diff --git a/apis/v1/jaeger_types.go b/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

diff --git a/apis/v1/jaeger_webhook.go b/apis/v1/jaeger_webhook.go
@@ -48,7 +48,6 @@ func (j *Jaeger) objsWithOptions() []*Options {
 // 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) ValidateCreate() (admission.Warnings, error) {
 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{}

diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/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

diff --git a/config/rbac/role.yaml b/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:

diff --git a/config/webhook/deployment_inject_patch.yaml b/config/webhook/deployment_inject_patch.yaml
diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml
@@ -8,4 +8,4 @@ configurations:
 - kustomizeconfig.yaml
 
 patchesStrategicMerge:
-  - deployment_inject_patch.yaml
+  - remove_deployment_webhook_patch.yaml
diff --git a/config/webhook/manifests.yaml b/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

diff --git a/config/webhook/remove_deployment_webhook_patch.yaml b/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