Skip to content

Commit 2930aac

Browse files
authored
Merge pull request #297 from rabbitmq/1-step-install
Generate single manifest for installation #(228)
2 parents 2a31789 + f971160 commit 2930aac

File tree

5 files changed

+16
-47
lines changed

5 files changed

+16
-47
lines changed

Diff for: .gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ cover.out
44
.idea/
55
.envrc
66
tags
7-
installation/
8-
!config/installation/
7+
releases/

Diff for: Makefile

+4-6
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,10 @@ deploy-kind: check-env-docker-repo git-commit-sha manifests deploy-namespace-rba
8989
kustomize build config/crd | kubectl apply -f -
9090
kustomize build config/default/overlays/kind | sed 's@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f -
9191

92-
generate-installation-manifests:
93-
mkdir -p installation
94-
kustomize build config/namespace/base/ > installation/namespace.yaml
95-
kustomize build config/crd/ > installation/crd.yaml
96-
kustomize build config/rbac/ > installation/rbac.yaml
97-
kustomize build config/installation > installation/operator.yaml
92+
# Builds a single-file installation manifest to deploy the Operator
93+
generate-installation-manifest:
94+
mkdir -p releases
95+
kustomize build config/installation/ > releases/rabbitmq-cluster-operator.yaml
9896

9997
# Build the docker image
10098
docker-build: check-env-docker-repo git-commit-sha

Diff for: config/installation/kustomization.yaml

+11-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
88
#
99

10-
resources:
11-
- ../default/base
12-
10+
apiVersion: kustomize.config.k8s.io/v1beta1
11+
kind: Kustomization
1312
namespace: rabbitmq-system
14-
15-
patches:
16-
- manager_deployment_patch.yaml
13+
images:
14+
- name: rabbitmqoperator/rabbitmq-cluster-kubernetes-operator-dev
15+
newName: rabbitmqoperator/rabbitmq-cluster-kubernetes-operator
16+
newTag: latest
17+
resources:
18+
- ../namespace/base/
19+
- ../crd/
20+
- ../rbac/
21+
- ../manager/

Diff for: config/installation/manager_deployment_patch.yaml

-21
This file was deleted.

Diff for: config/installation/overlay/ci/kustomization.yaml

-12
This file was deleted.

0 commit comments

Comments
 (0)