Fix cronjob version in manifest used for tests (#30733)

elastic · Mar 9, 2022 · 644d026 · 644d026
1 parent 3560733
commit 644d026
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 17 deletions.
diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
@@ -165,8 +165,7 @@ rules:
   - apiGroups: [ "batch" ]
     resources:
       - jobs
-      # Uncomment if need metadata for cronjob objects in versions >= v1.21
-      #- cronjobs
+      - cronjobs
     verbs: [ "get", "list", "watch" ]
   # required for apiserver
   - nonResourceURLs:

diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-role.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-role.yaml
@@ -38,8 +38,7 @@ rules:
   - apiGroups: [ "batch" ]
     resources:
       - jobs
-      # Uncomment if need metadata for cronjob objects in versions >= v1.21
-      #- cronjobs
+      - cronjobs
     verbs: [ "get", "list", "watch" ]
   # required for apiserver
   - nonResourceURLs:

diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@@ -703,8 +703,7 @@ rules:
   - apiGroups: ["batch"]
     resources:
       - jobs
-      # Uncomment if need metadata for cronjob objects in versions >= v1.21
-      #- cronjobs
+      - cronjobs
     verbs: ["get", "list", "watch"]
   - apiGroups:
       - ""

diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-role.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-role.yaml
@@ -32,8 +32,7 @@ rules:
   - apiGroups: ["batch"]
     resources:
       - jobs
-      # Uncomment if need metadata for cronjob objects in versions >= v1.21
-      #- cronjobs
+      - cronjobs
     verbs: ["get", "list", "watch"]
   - apiGroups:
       - ""

diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -298,8 +298,7 @@ rules:
 - apiGroups: ["batch"]
   resources:
   - jobs
-  # Uncomment if need metadata for cronjob objects in versions >= v1.21
-  #- cronjobs
+  - cronjobs
   verbs: ["get", "list", "watch"]
 - apiGroups:
   - ""

diff --git a/deploy/kubernetes/metricbeat/metricbeat-role.yaml b/deploy/kubernetes/metricbeat/metricbeat-role.yaml
@@ -31,8 +31,7 @@ rules:
 - apiGroups: ["batch"]
   resources:
   - jobs
-  # Uncomment if need metadata for cronjob objects in versions >= v1.21
-  #- cronjobs
+  - cronjobs
   verbs: ["get", "list", "watch"]
 - apiGroups:
   - ""

diff --git a/dev-tools/mage/kubernetes/kind.go b/dev-tools/mage/kubernetes/kind.go
@@ -46,7 +46,7 @@ func (m *KindIntegrationTestStep) Use(dir string) (bool, error) {
 
 // Setup ensures that a kubernetes cluster is up and running.
 //
-// If `KUBECONFIG` is already deinfed in the env then it will do nothing.
+// If `KUBECONFIG` is already defined in the env then it will do nothing.
 func (m *KindIntegrationTestStep) Setup(env map[string]string) error {
 
 	envVars := []string{"KUBECONFIG", "KUBE_CONFIG"}

diff --git a/metricbeat/module/kubernetes/_meta/test/docs/02_objects/cronjob.yaml b/metricbeat/module/kubernetes/_meta/test/docs/02_objects/cronjob.yaml
@@ -1,7 +1,7 @@
 # Cronjob that will execute each minute.
 # It will print a message and sleep (reporting being active) for 5 seconds
 
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: mycronjob
@@ -16,7 +16,7 @@ spec:
             image: alpine
             imagePullPolicy: IfNotPresent
             command: ['sh', '-c', 'echo elastic world ; sleep 5']
-    
+
           restartPolicy: OnFailure
           terminationGracePeriodSeconds: 0
-  concurrencyPolicy: Allow
+  concurrencyPolicy: Allow
diff --git a/metricbeat/module/kubernetes/kubernetes.yml b/metricbeat/module/kubernetes/kubernetes.yml
@@ -108,7 +108,7 @@ spec:
         requests:
           storage: 1Mi
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: basic-cronjob