Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor kustomize experiment #4839

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- operator-deployment.yaml
- operator-service-account.yaml
- operator-deployment.yaml

patchesStrategicMerge:
- patch-toleration.yaml
Expand All @@ -29,4 +29,4 @@ patchesStrategicMerge:
patches:
- path: patch-log-level.yaml
target:
kind: Deployment
kind: Deployment
2 changes: 1 addition & 1 deletion config/manifests/bases/camel-k.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
repository: https://github.com/apache/camel-k
support: Camel
name: camel-k.v2.2.0
namespace: placeholder
namespace: default
spec:
apiservicedefinitions: {}
customresourcedefinitions:
Expand Down
2 changes: 0 additions & 2 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@ resources:
- operator-role-binding-keda.yaml
- operator-role-binding-knative.yaml
- operator-role-binding-leases.yaml
- operator-role-binding-local-registry.yaml
- operator-role-binding-podmonitors.yaml
- operator-role-binding-strimzi.yaml
- operator-role-binding.yaml
- operator-cluster-role-custom-resource-definitions.yaml
- operator-cluster-role-binding-custom-resource-definitions.yaml
- operator-cluster-role-addressable-resolver.yaml
- operator-cluster-role-binding-addressable-resolver.yaml
- operator-cluster-role-local-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: camel-k-operator
namespace: placeholder
namespace: default
roleRef:
kind: ClusterRole
name: camel-k-operator-console-openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: camel-k-operator
namespace: placeholder
namespace: default
roleRef:
kind: ClusterRole
name: camel-k-operator-bind-addressable-resolver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: camel-k-operator
namespace: placeholder
namespace: default
roleRef:
kind: ClusterRole
name: camel-k-operator-custom-resource-definitions
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/patch-rolebinding-to-clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
value: ClusterRole
- op: add
path: /subjects/0/namespace
value: placeholder
value: default
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@
# limitations under the License.
# ---------------------------------------------------------------------------

#
# rbac resources applicable for all kubernetes platforms
#
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

#
# * patch-integration-platform.yaml
# customizes the integration platform custom resource
# Edit the patch manually to add required configuration
#
resources:
- ../config/samples/bases/camel_v1_integrationplatform.yaml

patchesStrategicMerge:
- ../config/samples/patch-integration-platform.yaml
- operator-role-binding-local-registry.yaml
- operator-cluster-role-local-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ rules:
- apiGroups: [""]
resources: ["configmaps"]
resourceNames: ["local-registry-hosting"]
verbs: ["get"]
verbs: ["get"]
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: camel-k-operator
namespace: placeholder
namespace: default
roleRef:
kind: ClusterRole
name: camel-k-operator-local-registry
Expand Down
Loading
Loading