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

feat(helm): align resources for helm #5976

Merged
merged 2 commits into from
Dec 7, 2024
Merged
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
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/installation/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The operator is now up and running. However, there is a second step you need to

The majority of configuration required to tune the operator are stored in an `IntegrationPlatform` custom resource. This is mainly required to provide configuration for the container registry, build time configuration or common profile you want to apply to all your `Integrations`.

Camel K requires a container registry which is used to store the images built for your applications. Certain clusters may use their internal container registry (ie, Openshift, Minikube or https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry[KEP-1755 compatible] clusters).
Camel K requires a container registry which is used to store the images built for your applications. Certain clusters may use their internal container registry (eg, Openshift, Minikube).

**IMPORTANT:** You need to create an `IntegrationPlatform` with the following configuration in the namespace where the operator is running:

Expand Down
2 changes: 1 addition & 1 deletion e2e/install/helm/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (
func TestHelmInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
containerRegistry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY")
g.Expect(ok).To(BeTrue(), "This test requires setting KAMEL_INSTALL_REGISTRY variable.")
g.Expect(ok).To(BeTrue(), "You must provide a registry address in KAMEL_INSTALL_REGISTRY env variable")
// Let's make sure no CRD is yet available in the cluster
// as we must make the procedure to install them accordingly
g.Eventually(CRDs(t)).Should(BeNil(), "No Camel K CRDs should be previously installed for this test")
Expand Down
3 changes: 1 addition & 2 deletions e2e/support/test_support.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ const ExpectedKubePromoteRoles = 7
// camel-k-edit
// camel-k-operator-custom-resource-definitions
// camel-k-operator-bind-addressable-resolver
// camel-k-operator-local-registry
const ExpectedKubeClusterRoles = 4
const ExpectedKubeClusterRoles = 3

// camel-k-operator-openshift
const ExpectedOSPromoteRoles = 1
Expand Down
196 changes: 0 additions & 196 deletions helm/camel-k/templates/operator-cluster-role-bindings.yaml

This file was deleted.

50 changes: 0 additions & 50 deletions helm/camel-k/templates/operator-role-binding.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,12 @@ metadata:
annotations:
{{ toYaml . | nindent 4 }}
{{- end }}

---

apiVersion: v1
kind: ServiceAccount
metadata:
name: camel-k-builder
labels:
app: "camel-k"
Loading
Loading