Update expected output for empty bundle removal
This commit is contained in:
Mario Manno
@@ -1,241 +1,5 @@
|
|||||||
apiVersion: fleet.cattle.io/v1alpha1
|
apiVersion: fleet.cattle.io/v1alpha1
|
||||||
kind: Bundle
|
kind: Bundle
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
fleet.cattle.io/commit: fake
|
|
||||||
name: test
|
|
||||||
namespace: fleet-local
|
|
||||||
spec:
|
|
||||||
resources:
|
|
||||||
- content: "# Helm Multi-Chart Example\n\nThis example will deploy the [Kubernetes
|
|
||||||
sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/)
|
|
||||||
application \npackaged as a Helm chart into the `fleet-helm-example` namespace.\nIt
|
|
||||||
will also deploy Rancher Monitoring helm charts into the `cattle-monitoring-system`
|
|
||||||
namespace.\n\n```yaml\nkind: GitRepo\napiVersion: fleet.cattle.io/v1alpha1\nmetadata:\n
|
|
||||||
\ name: helm\n namespace: fleet-local\nspec:\n repo: https://github.com/rancher/fleet-examples\n
|
|
||||||
\ paths:\n - single-cluster/helm-multi-chart\n```\n"
|
|
||||||
name: README.md
|
|
||||||
- content: |
|
|
||||||
apiVersion: v2
|
|
||||||
name: guestbook
|
|
||||||
description: Sample application
|
|
||||||
version: 0.0.0
|
|
||||||
appVersion: 0.0.0
|
|
||||||
name: guestbook/Chart.yaml
|
|
||||||
- content: |
|
|
||||||
# This file and all contents in it are OPTIONAL.
|
|
||||||
|
|
||||||
# The namespace this chart will be installed to,
|
|
||||||
# if not specified the chart will be installed to "default"
|
|
||||||
namespace: fleet-multi-chart-helm-example
|
|
||||||
|
|
||||||
# Custom helm options
|
|
||||||
helm:
|
|
||||||
# The release name to use. If empty a generated release name will be used
|
|
||||||
releaseName: guestbook
|
|
||||||
|
|
||||||
# The directory of the chart in the repo. Also any valid go-getter supported
|
|
||||||
# URL can be used there is specify where to download the chart from.
|
|
||||||
# If repo below is set this value if the chart name in the repo
|
|
||||||
chart: ""
|
|
||||||
|
|
||||||
# An https to a valid Helm repository to download the chart from
|
|
||||||
repo: ""
|
|
||||||
|
|
||||||
# Used if repo is set to look up the version of the chart
|
|
||||||
version: ""
|
|
||||||
|
|
||||||
# Force recreate resource that can not be updated
|
|
||||||
force: false
|
|
||||||
|
|
||||||
# How long for helm to wait for the release to be active. If the value
|
|
||||||
# is less that or equal to zero, we will not wait in Helm
|
|
||||||
timeoutSeconds: 0
|
|
||||||
|
|
||||||
# Custom values that will be passed as values.yaml to the installation
|
|
||||||
values:
|
|
||||||
replicas: 2
|
|
||||||
name: guestbook/fleet.yaml
|
|
||||||
- content: |
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: frontend
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: guestbook
|
|
||||||
tier: frontend
|
|
||||||
replicas: {{ .Values.replicas }}
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: guestbook
|
|
||||||
tier: frontend
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: php-redis
|
|
||||||
image: gcr.io/google-samples/gb-frontend:v5
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 100Mi
|
|
||||||
ports:
|
|
||||||
- containerPort: 80
|
|
||||||
name: guestbook/templates/frontend-deployment.yaml
|
|
||||||
- content: |
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: frontend
|
|
||||||
labels:
|
|
||||||
app: guestbook
|
|
||||||
tier: frontend
|
|
||||||
spec:
|
|
||||||
type: "{{ .Values.serviceType }}"
|
|
||||||
ports:
|
|
||||||
- port: 80
|
|
||||||
selector:
|
|
||||||
app: guestbook
|
|
||||||
tier: frontend
|
|
||||||
name: guestbook/templates/frontend-service.yaml
|
|
||||||
- content: |
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: redis-master
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: redis
|
|
||||||
role: master
|
|
||||||
tier: backend
|
|
||||||
replicas: 1
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: redis
|
|
||||||
role: master
|
|
||||||
tier: backend
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: master
|
|
||||||
image: registry.k8s.io/redis:e2e
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 100Mi
|
|
||||||
ports:
|
|
||||||
- containerPort: 6379
|
|
||||||
name: guestbook/templates/redis-master-deployment.yaml
|
|
||||||
- content: |
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: redis-master
|
|
||||||
labels:
|
|
||||||
app: redis
|
|
||||||
role: master
|
|
||||||
tier: backend
|
|
||||||
spec:
|
|
||||||
ports:
|
|
||||||
- port: 6379
|
|
||||||
targetPort: 6379
|
|
||||||
selector:
|
|
||||||
app: redis
|
|
||||||
role: master
|
|
||||||
tier: backend
|
|
||||||
name: guestbook/templates/redis-master-service.yaml
|
|
||||||
- content: |
|
|
||||||
{{ if .Values.replication }}
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: redis-slave
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: redis
|
|
||||||
role: slave
|
|
||||||
tier: backend
|
|
||||||
replicas: 2
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: redis
|
|
||||||
role: slave
|
|
||||||
tier: backend
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: slave
|
|
||||||
image: gcr.io/google_samples/gb-redisslave:v2
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 100Mi
|
|
||||||
ports:
|
|
||||||
- containerPort: 6379
|
|
||||||
{{ end }}
|
|
||||||
name: guestbook/templates/redis-slave-deployment.yaml
|
|
||||||
- content: |
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: redis-slave
|
|
||||||
labels:
|
|
||||||
app: redis
|
|
||||||
role: slave
|
|
||||||
tier: backend
|
|
||||||
spec:
|
|
||||||
ports:
|
|
||||||
- port: 6379
|
|
||||||
selector:
|
|
||||||
app: redis
|
|
||||||
{{ if .Values.replication }}
|
|
||||||
role: slave
|
|
||||||
{{ else }}
|
|
||||||
role: master
|
|
||||||
{{ end }}
|
|
||||||
tier: backend
|
|
||||||
name: guestbook/templates/redis-slave-service.yaml
|
|
||||||
- content: |
|
|
||||||
replication: true
|
|
||||||
replicas: 1
|
|
||||||
serviceType: NodePort
|
|
||||||
name: guestbook/values.yaml
|
|
||||||
- content: |
|
|
||||||
defaultNamespace: cattle-monitoring-system
|
|
||||||
helm:
|
|
||||||
releaseName: rancher-monitoring-crd
|
|
||||||
chart: rancher-monitoring-crd
|
|
||||||
repo: https://charts.rancher.io
|
|
||||||
version: 100.1.2+up19.0.3
|
|
||||||
name: rancher-monitoring-crd/fleet.yaml
|
|
||||||
- content: |
|
|
||||||
defaultNamespace: cattle-monitoring-system
|
|
||||||
helm:
|
|
||||||
releaseName: rancher-monitoring
|
|
||||||
repo: https://charts.rancher.io
|
|
||||||
chart: rancher-monitoring
|
|
||||||
version: 100.1.2+up19.0.3
|
|
||||||
diff:
|
|
||||||
comparePatches:
|
|
||||||
- apiVersion: admissionregistration.k8s.io/v1
|
|
||||||
kind: MutatingWebhookConfiguration
|
|
||||||
name: rancher-monitoring-admission
|
|
||||||
operations:
|
|
||||||
- {"op":"remove", "path":"/webhooks/0/failurePolicy"}
|
|
||||||
- apiVersion: admissionregistration.k8s.io/v1
|
|
||||||
kind: ValidatingWebhookConfiguration
|
|
||||||
name: rancher-monitoring-admission
|
|
||||||
operations:
|
|
||||||
- {"op":"remove", "path":"/webhooks/0/failurePolicy"}
|
|
||||||
name: rancher-monitoring/fleet.yaml
|
|
||||||
targets:
|
|
||||||
- clusterGroup: default
|
|
||||||
name: default
|
|
||||||
apiVersion: fleet.cattle.io/v1alpha1
|
|
||||||
kind: Bundle
|
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
fleet.cattle.io/commit: fake
|
fleet.cattle.io/commit: fake
|
||||||
|
|||||||
Reference in New Issue
Block a user