change ansible k8s dep

Signed-off-by: Liran Rotenberg <[email protected]>

Makefile

@@ -83,7 +83,7 @@ ci: all tidy vendor bazel-generate generate-verify
 all: test forklift-controller
 
 # Run tests
-test: generate fmt vet manifests
+test: manifests generate fmt vet
 	go test ./pkg/... ./cmd/... -coverprofile cover.out
 
 # Experimental e2e target
@@ -108,15 +108,15 @@ e2e-sanity-openstack-extended:
 
 
 # Build forklift-controller binary
-forklift-controller: generate fmt vet
+forklift-controller: manifests generate fmt vet
 	go build -o bin/forklift-controller github.com/konveyor/forklift-controller/cmd/forklift-controller
 
 # Build manager binary with compiler optimizations disabled
-debug: generate fmt vet
+debug: manifests generate fmt vet
 	go build -o bin/forklift-controller -gcflags=all="-N -l" github.com/konveyor/forklift-controller/cmd/forklift-controller
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
-run: generate fmt vet
+run: manifests generate fmt vet
 	export METRICS_PORT=8888;\
 		KUBEVIRT_CLIENT_GO_SCHEME_REGISTRATION_VERSION=v1 go run ./cmd/forklift-controller/main.go
 

operator/config/default/kustomization.yaml

@@ -9,8 +9,10 @@ namespace: forklift-operator-system
 namePrefix: ""
 
 # Labels to add to all resources and selectors.
-#commonLabels:
-#  someName: someValue
+#labels:
+#- includeSelectors: true
+#  pairs:
+#    someName: someValue
 
 resources:
 - ../crd

operator/config/default/manager_auth_proxy_patch.yaml

@@ -16,7 +16,7 @@ spec:
         # capabilities:
         #   drop:
         #     - "ALL"
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

operator/config/rbac/role.yaml

@@ -4,6 +4,12 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - watch
 - apiGroups:
   - config.openshift.io
   resources:

operator/config/testing/kustomization.yaml

@@ -4,8 +4,10 @@ namespace: osdk-test
 namePrefix: osdk-
 
 # Labels to add to all resources and selectors.
-#commonLabels:
-#  someName: someValue
+#labels:
+#- includeSelectors: true
+#  pairs:
+#    someName: someValue
 
 patchesStrategicMerge:
 - manager_image.yaml

operator/molecule/default/converge.yml

@@ -8,7 +8,7 @@
 
   tasks:
     - name: Create Namespace
-      k8s:
+      kubernetes.core.k8s:
         api_version: v1
         kind: Namespace
         name: '{{ namespace }}'

operator/molecule/default/destroy.yml

@@ -12,7 +12,7 @@
         state: absent
 
     - name: Destroy Namespace
-      k8s:
+      kubernetes.core.k8s:
         api_version: v1
         kind: Namespace
         name: '{{ namespace }}'

operator/molecule/default/kustomize.yml

@@ -8,14 +8,14 @@
   changed_when: false
 
 - name: Set resources to {{ state }}
-  k8s:
+  kubernetes.core.k8s:
     definition: '{{ item }}'
     state: '{{ state }}'
     wait: no
   loop: '{{ resources.stdout | from_yaml_all | list }}'
 
 - name: Wait for resources to get to {{ state }}
-  k8s:
+  kubernetes.core.k8s:
     definition: '{{ item }}'
     state: '{{ state }}'
     wait: yes

operator/molecule/default/molecule.yml

@@ -3,18 +3,12 @@ dependency:
   name: galaxy
 driver:
   name: delegated
-lint: |
-  set -e
-  yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" .
 platforms:
   - name: cluster
     groups:
       - k8s
 provisioner:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint
   inventory:
     group_vars:
       all:
@@ -31,6 +25,3 @@ provisioner:
     K8S_AUTH_KUBECONFIG: ${KUBECONFIG:-"~/.kube/config"}
 verifier:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint

operator/molecule/default/tasks/forkliftcontroller_test.yml

@@ -1,6 +1,6 @@
 ---
 - name: Create the forklift.konveyor.io/v1beta1.ForkliftController
-  k8s:
+  kubernetes.core.k8s:
     state: present
     namespace: '{{ namespace }}'
     definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}"

operator/molecule/kind/molecule.yml

@@ -3,9 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: delegated
-lint: |
-  set -e
-  yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" .
 platforms:
   - name: cluster
     groups:
@@ -15,9 +12,6 @@ provisioner:
   playbooks:
     prepare: ../default/prepare.yml
     verify: ../default/verify.yml
-  lint: |
-    set -e
-    ansible-lint
   inventory:
     group_vars:
       all:
@@ -37,6 +31,3 @@ provisioner:
     KUBECONFIG: ${MOLECULE_EPHEMERAL_DIRECTORY}/kubeconfig
 verifier:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint

operator/requirements.yml

@@ -1,10 +1,8 @@
 ---
 collections:
-  - name: community.kubernetes
-    version: "2.0.1"
   - name: operator_sdk.util
-    version: "0.4.0"
+    version: "0.5.0"
   - name: kubernetes.core
-    version: "2.3.1"
+    version: "2.4.0"
   - name: cloud.common
-    version: "2.1.1"
+    version: "2.1.4"

operator/roles/forkliftcontroller/meta/main.yml

@@ -14,7 +14,7 @@ galaxy_info:
   platforms:
   - name: EL
     versions:
-    - 8
+    - 9
 
   galaxy_tags:
   - forklift
@@ -28,4 +28,4 @@ galaxy_info:
 dependencies: []
 collections:
 - operator_sdk.util
-- community.kubernetes
+- kubernetes.core

operator/roles/forkliftcontroller/tasks/cleanup.yml

@@ -2,15 +2,15 @@
 - block:
 
   - name: "Get {{ resource_kind }} resources labeled {{ feature_label }}"
-    k8s_info:
+    kubernetes.core.k8s_info:
       namespace: "{{ app_namespace }}"
       kind: "{{ resource_kind }}"
       label_selectors:
         - "service = {{ feature_label }}"
     register: results
 
   - name: "Clean up {{ resource_kind }} resources labeled {{ feature_label }}"
-    k8s:
+    kubernetes.core.k8s:
       namespace: "{{ app_namespace }}"
       kind: "{{ results.resources[0].kind }}"
       name: "{{ results.resources[0].metadata.name }}"