From 09ee3266e0cebdb34cc9bd1daa2a30e980b706a2 Mon Sep 17 00:00:00 2001 From: Christopher Haar Date: Fri, 2 Feb 2024 16:36:32 +0100 Subject: [PATCH 1/3] feat(in-cluster): update example to use native crossplane way Signed-off-by: Christopher Haar --- examples/provider/config-in-cluster.yaml | 31 ++++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/examples/provider/config-in-cluster.yaml b/examples/provider/config-in-cluster.yaml index 3150c45f..083a6384 100644 --- a/examples/provider/config-in-cluster.yaml +++ b/examples/provider/config-in-cluster.yaml @@ -1,8 +1,3 @@ -# Make sure provider-kubernetes has enough permissions to install your objects into cluster -# -# You can give admin permissions by running: -# SA=$(kubectl -n crossplane-system get sa -o name | grep provider-kubernetes | sed -e 's|serviceaccount\/|crossplane-system:|g') -# kubectl create clusterrolebinding provider-kubernetes-admin-binding --clusterrole cluster-admin --serviceaccount="${SA}" apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig metadata: @@ -10,3 +5,29 @@ metadata: spec: credentials: source: InjectedIdentity + runtimeConfigRef: + apiVersion: pkg.crossplane.io/v1beta1 + kind: DeploymentRuntimeConfig + name: provider-kubernetes +--- +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: provider-kubernetes +spec: + serviceAccountTemplate: + metadata: + name: provider-kubernetes +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: provider-kubernetes-cluster-admin +subjects: + - kind: ServiceAccount + name: provider-kubernetes + namespace: crossplane-system +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io From 35d28d424b6e6ae9185ed03e1f6acaab62c322aa Mon Sep 17 00:00:00 2001 From: Christopher Haar Date: Fri, 2 Feb 2024 16:55:58 +0100 Subject: [PATCH 2/3] feat(in-cluster): update example to use native crossplane way Signed-off-by: Christopher Haar --- examples/provider/config-in-cluster.yaml | 29 ++----------------- examples/provider/provider-in-cluster.yaml | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 examples/provider/provider-in-cluster.yaml diff --git a/examples/provider/config-in-cluster.yaml b/examples/provider/config-in-cluster.yaml index 083a6384..3d7591fc 100644 --- a/examples/provider/config-in-cluster.yaml +++ b/examples/provider/config-in-cluster.yaml @@ -1,33 +1,8 @@ +## check provider-in-cluster.yaml for grant access apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig metadata: name: kubernetes-provider spec: credentials: - source: InjectedIdentity - runtimeConfigRef: - apiVersion: pkg.crossplane.io/v1beta1 - kind: DeploymentRuntimeConfig - name: provider-kubernetes ---- -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: provider-kubernetes -spec: - serviceAccountTemplate: - metadata: - name: provider-kubernetes ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: provider-kubernetes-cluster-admin -subjects: - - kind: ServiceAccount - name: provider-kubernetes - namespace: crossplane-system -roleRef: - kind: ClusterRole - name: cluster-admin - apiGroup: rbac.authorization.k8s.io + source: InjectedIdentity \ No newline at end of file diff --git a/examples/provider/provider-in-cluster.yaml b/examples/provider/provider-in-cluster.yaml new file mode 100644 index 00000000..52988f19 --- /dev/null +++ b/examples/provider/provider-in-cluster.yaml @@ -0,0 +1,33 @@ +--- +apiVersion: pkg.crossplane.io/v1 +kind: Provider +metadata: + name: provider-kubernetes +spec: + package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.10.0 + runtimeConfigRef: + apiVersion: pkg.crossplane.io/v1beta1 + kind: DeploymentRuntimeConfig + name: provider-kubernetes +--- +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: provider-kubernetes +spec: + serviceAccountTemplate: + metadata: + name: provider-kubernetes +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: provider-kubernetes-cluster-admin +subjects: + - kind: ServiceAccount + name: provider-kubernetes + namespace: crossplane-system +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io From ad766ee7caf64e9b6f3625f730355e2bf925841b Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Thu, 8 Feb 2024 15:57:12 +0300 Subject: [PATCH 3/3] Update version in incluster example Signed-off-by: Hasan Turken --- examples/provider/config-in-cluster.yaml | 2 +- examples/provider/provider-in-cluster.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/provider/config-in-cluster.yaml b/examples/provider/config-in-cluster.yaml index 3d7591fc..0133ac72 100644 --- a/examples/provider/config-in-cluster.yaml +++ b/examples/provider/config-in-cluster.yaml @@ -1,4 +1,4 @@ -## check provider-in-cluster.yaml for grant access +# Check ./provider-in-cluster.yaml to see how to grant permissions to the Provider apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig metadata: diff --git a/examples/provider/provider-in-cluster.yaml b/examples/provider/provider-in-cluster.yaml index 52988f19..b5e6b4be 100644 --- a/examples/provider/provider-in-cluster.yaml +++ b/examples/provider/provider-in-cluster.yaml @@ -4,7 +4,7 @@ kind: Provider metadata: name: provider-kubernetes spec: - package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.10.0 + package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.11.4 runtimeConfigRef: apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig