From 98b9a3208b13e95af3f933c8aa287f102c16ba15 Mon Sep 17 00:00:00 2001 From: nshankar13 Date: Thu, 12 Nov 2020 11:20:24 -0500 Subject: [PATCH 1/3] Restructured Chart Changed Makefile Edited Makefile Corrected Makefile again Deleted osm and edited makefile Testing chart locally --- charts/osm-arc/Chart.yaml | 1 - charts/osm-arc/values.yaml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/osm-arc/Chart.yaml b/charts/osm-arc/Chart.yaml index 254042fb..675a1197 100644 --- a/charts/osm-arc/Chart.yaml +++ b/charts/osm-arc/Chart.yaml @@ -26,4 +26,3 @@ dependencies: - name: osm version: "0.5.0" repository: "https://openservicemesh.github.io/osm" - diff --git a/charts/osm-arc/values.yaml b/charts/osm-arc/values.yaml index 7e5b90b6..213ab7f4 100644 --- a/charts/osm-arc/values.yaml +++ b/charts/osm-arc/values.yaml @@ -19,6 +19,11 @@ osm: enforceSingleMesh: true enablePrometheus: false deployJaeger: false + customLogAnalyticsWorkspace: false + customerID: 49a4d43a-81ef-4607-83f6-a13872c6ae60 + sharedKey: 5q+pyUKQtxtef8ZGTb+aYYcFWR54lmtXpA0AYWJSqUOGBRd9AHgDZZmb0uuLpjOjIMZTp+F3F4e5JUMOWUmHHw== + fluentbitOutput: azure + webhookConfigNamePrefix: arc-osm-webhook sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.15.0 alpine: From 52c293c01c6e3db7892e3a51a7990785d8b06dfb Mon Sep 17 00:00:00 2001 From: nshankar13 Date: Thu, 10 Dec 2020 12:53:41 -0500 Subject: [PATCH 2/3] updated to 0.6.0-rc.1 and edited values.yaml --- charts/osm-arc/Chart.yaml | 6 +++--- charts/osm-arc/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/osm-arc/Chart.yaml b/charts/osm-arc/Chart.yaml index 675a1197..808a529d 100644 --- a/charts/osm-arc/Chart.yaml +++ b/charts/osm-arc/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.6.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: v0.5.0 +appVersion: v0.6.0-rc.1 dependencies: - name: osm - version: "0.5.0" + version: "0.6.0-rc.1" repository: "https://openservicemesh.github.io/osm" diff --git a/charts/osm-arc/values.yaml b/charts/osm-arc/values.yaml index 213ab7f4..b9365e49 100644 --- a/charts/osm-arc/values.yaml +++ b/charts/osm-arc/values.yaml @@ -25,6 +25,7 @@ osm: fluentbitOutput: azure webhookConfigNamePrefix: arc-osm-webhook sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.15.0 + connectVault: false alpine: image: From 56d31cfa845fa5eb009032ecbddd600db0cabf88 Mon Sep 17 00:00:00 2001 From: nshankar13 Date: Thu, 10 Dec 2020 19:47:37 -0500 Subject: [PATCH 3/3] Changed Test.bats --- test/bats/test.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bats/test.bats b/test/bats/test.bats index eda89fe8..75694839 100644 --- a/test/bats/test.bats +++ b/test/bats/test.bats @@ -32,7 +32,7 @@ SLEEP_TIME_DEPLOYMENTS=10 } @test "mutating webhook has been deployed" { - run wait_for_process $WAIT_TIME $SLEEP_TIME "kubectl get mutatingwebhookconfigurations.admissionregistration.k8s.io osm-webhook-osm" + run wait_for_process $WAIT_TIME $SLEEP_TIME "kubectl get mutatingwebhookconfigurations.admissionregistration.k8s.io arc-osm-webhook-osm" assert_success }