Merge pull request #108 from zzxwill/logging

    Fix syntax checking issue

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.13 as builder
+FROM golang:1.16 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,9 +19,14 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:nonroot
+FROM golang:1.16
 WORKDIR /
 COPY --from=builder /workspace/manager .
-USER nonroot:nonroot
+#USER nonroot:nonroot
+
+# COPY terraform binary
+COPY bin/terraform /usr/bin/terraform
+#RUN chmod +x /usr/bin/terraform
+RUN apt-get install git
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= oamdev/terraform-controller:0.1.17
+IMG ?= oamdev/terraform-controller:0.1.19
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
@@ -42,7 +42,7 @@ deploy: manifests
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=tf-api-role webhook paths="./..." output:crd:artifacts:config=chart/crds
-	mv config/rbac/role.yaml chart/templates/tf_api_role.yaml
+	# mv config/rbac/role.yaml chart/templates/tf_api_role.yaml
 
 # Run go fmt against code
 fmt: goimports

chart/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 name: terraform-controller
-version: 0.1.17
+version: 0.1.19
 description: A Kubernetes Terraform controller
 home: https://github.com/oam-dev/terraform-controller

chart/templates/read_provider_creds_role.yml

@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: read-provider-creds
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
       - ""

chart/templates/tf_api_role.yaml

@@ -1,48 +1,67 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: tf-api-role
+  namespace: {{ .Release.Namespace }}
 rules:
-- apiGroups:
-  - terraform.core.oam.dev
-  resources:
-  - configurations
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - terraform.core.oam.dev
-  resources:
-  - configurations/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - terraform.core.oam.dev
-  resources:
-  - providers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - terraform.core.oam.dev
-  resources:
-  - providers/status
-  verbs:
-  - get
-  - patch
-  - update
+  - apiGroups:
+      - terraform.core.oam.dev
+    resources:
+      - configurations
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - terraform.core.oam.dev
+    resources:
+      - configurations/status
+    verbs:
+      - get
+      - patch
+      - update
+  - apiGroups:
+      - terraform.core.oam.dev
+    resources:
+      - providers
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - terraform.core.oam.dev
+    resources:
+      - providers/status
+    verbs:
+      - get
+      - patch
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - "secrets"
+    verbs:
+      - "get"
+      - "list"
+      - "create"
+      - "update"
+      - "delete"
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - "leases"
+    verbs:
+      - "create"
+      - "update"
+      - "get"
+      - "delete"

chart/templates/tf_api_role_binding.yaml

@@ -9,4 +9,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: tf-controller-service-account
-  namespace: {{.Release.Namespace}}
+  namespace: {{ .Release.Namespace }}

chart/templates/tf_controller_clusterrole.yml

@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: tf-controller-clusterrole
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
       - ""
@@ -20,6 +21,7 @@ rules:
       - "create"
       - "update"
       - "watch"
+      - "delete"
   - apiGroups:
       - "batch"
     resources:

chart/templates/tf_controller_role.yaml

@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: tf-controller-role
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
     - ""

chart/templates/tf_executor_role.yml

@@ -14,6 +14,7 @@ rules:
       - "list"
       - "create"
       - "update"
+      - "delete"
   - apiGroups:
       - "coordination.k8s.io"
     resources:

chart/values.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 
-version: 0.1.17
+version: 0.1.19
 
 image:
-  name: oamdev/terraform-controller:0.1.17
+  name: oamdev/terraform-controller:0.1.19
   imagePullPolicy: Always

config/rbac/role.yaml

@@ -0,0 +1,48 @@
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: tf-api-role
+rules:
+- apiGroups:
+  - terraform.core.oam.dev
+  resources:
+  - configurations
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - terraform.core.oam.dev
+  resources:
+  - configurations/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - terraform.core.oam.dev
+  resources:
+  - providers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - terraform.core.oam.dev
+  resources:
+  - providers/status
+  verbs:
+  - get
+  - patch
+  - update