Skip to content

Commit 29723be

Browse files
committed
Deleted osm and edited makefile
1 parent 81352e7 commit 29723be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+17
-6460
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -353,3 +353,6 @@ MigrationBackup/
353353

354354
# Ionide (cross platform F# VS Code tools) working folder
355355
.ionide/
356+
357+
# Chart-tgzs generated by dependency update
358+
charts/osm/charts

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ KIND_VERSION ?= 0.8.1
33
KUBERNETES_VERSION ?= v1.19.0
44
HELM_VERSION ?= 3.3.4
55

6+
package-osm-chart:
7+
helm dependency update osm-arc
8+
69
e2e-bootstrap:
710
# Download and install kind
811
curl -L https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-linux-amd64 --output ${GITHUB_WORKSPACE}/bin/kind && chmod +x ${GITHUB_WORKSPACE}/bin/kind
@@ -23,8 +26,7 @@ e2e-helm-deploy:
2326
mkdir -p .staging/helm
2427
curl https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz > .staging/helm/helmbin.tar.gz
2528
cd .staging/helm && tar -xvf helmbin.tar.gz
26-
./.staging/helm/linux-amd64/helm dependency update ./charts/osm-arc
27-
./.staging/helm/linux-amd64/helm install osm ./charts/osm-arc --namespace arc-osm-system
29+
./.staging/helm/linux-amd64/helm install osm ./charts/osm-arc --namespace arc-osm-system --dependency-update
2830

2931
test-e2e:
3032
bats -t test/bats/test.bats

charts/osm-arc/Chart.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: osm
3-
repository: file://../../charts/osm
4-
version: 0.5.0-rc.1
5-
digest: sha256:d1226533d04b95e18f2f0763a5c8a0bef8378917c5c7dbca83a84194cdf6eebb
6-
generated: "2020-11-11T19:27:13.3389966-05:00"
3+
repository: https://openservicemesh.github.io/osm
4+
version: 0.5.0
5+
digest: sha256:343d510c411a72e9abe9b9a740b0105c206271b813024917969ba0f7ecd4d8a6
6+
generated: "2020-11-13T13:54:31.7602449-05:00"

charts/osm-arc/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: osm-arc
3-
description: A Helm chart for Kubernetes
3+
description: A Helm chart to install the OSM control plane on Azure Arc enabled Kubernetes clusters.
44

55
# A chart can be either an 'application' or a 'library' chart.
66
#
@@ -24,6 +24,6 @@ appVersion: v0.5.0
2424

2525
dependencies:
2626
- name: osm
27-
version: "0.5.0-rc.1"
28-
repository: "file://../../charts/osm"
27+
version: "0.5.0"
28+
repository: "https://openservicemesh.github.io/osm"
2929

-17.6 KB
Binary file not shown.

charts/osm-arc/charts/osm-0.5.0.tgz

17 KB
Binary file not shown.

charts/osm-arc/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ osm:
99
enableDebugServer: true
1010
enablePermissiveTrafficPolicy: true
1111
enableFluentbit: true
12+
image:
13+
registry: mcr.microsoft.com/oss/openservicemesh
1214
fluentBitImage:
1315
name: fluentbit-logger
1416
registry: "mcr.microsoft.com/oss/fluent"
@@ -22,6 +24,7 @@ osm:
2224
sharedKey: 5q+pyUKQtxtef8ZGTb+aYYcFWR54lmtXpA0AYWJSqUOGBRd9AHgDZZmb0uuLpjOjIMZTp+F3F4e5JUMOWUmHHw==
2325
fluentbitOutput: azure
2426
webhookConfigNamePrefix: arc-osm-webhook
27+
sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.15.0
2528

2629
alpine:
2730
image:

charts/osm/.helmignore

-23
This file was deleted.

charts/osm/Chart.lock

-6
This file was deleted.

charts/osm/Chart.yaml

-21
This file was deleted.

charts/osm/README.md

-45
This file was deleted.

charts/osm/crds/access.yaml

-90
This file was deleted.

charts/osm/crds/experimental/backpressure.yaml

-21
This file was deleted.

charts/osm/crds/specs.yaml

-96
This file was deleted.

0 commit comments

Comments
 (0)