Remove Osiris from kubernetes commands (#1833)

Closes #1826

Author: ahmelsayed

README.md

@@ -170,18 +170,17 @@ Using the Core Tools, you can easily configure a Kubernetes cluster and run Azur
 
 ### Installing Kubernetes scalers
 
-This deploys [KEDA](https://github.com/kedacore/keda) and [Osiris](https://github.com/deislabs/osiris) to your cluster which allows you to deploy your functions in a scale-to-zero by default.
+This deploys [KEDA](https://github.com/kedacore/keda) to your cluster which allows you to deploy your functions in a scale-to-zero by default for non-http scenarios only.
 
 ```bash
 func kubernetes install --namespace {namespace}
 ```
 
 **KEDA:** Handles monitoring polling event sources currently QueueTrigger and ServiceBusTrigger.
-**Osiris:**: Handles Http traffic monitoring and on demand scale your deployment to and from 0
 
 ### Deploy to Kubernetes
 
-**First make sure you have Dockerfile for your project.** You can generate one using 
+**First make sure you have Dockerfile for your project.** You can generate one using
 ```bash
 func init --docker # or --docker-only (for existing projects)
 ```
@@ -242,16 +241,16 @@ aks-agentpool-20257154-2   Ready     agent     1d        v1.11.5
 An ACR instance can be created using the Azure Portal or the [Azure CLI](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-get-started-azure-cli#create-a-container-registry)
 
 #### Login to the ACR Registry
-Before pushing and pulling container images, you must log in to the ACR instance. 
+Before pushing and pulling container images, you must log in to the ACR instance.
 
 ```azurecli
 az acr login --name <acrName>
 ```
 
 #### Give the AKS cluster access to the ACR Registry
-The AKS cluster needs access to the ACR Registry to pull the container. Azure creates a service principal to support cluster operability with other Azure resources. This can be used for authentication with an ACR registry. See here for how to grant the right access here: [Authenticate with Azure Container Registry from Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-auth-aks)  
+The AKS cluster needs access to the ACR Registry to pull the container. Azure creates a service principal to support cluster operability with other Azure resources. This can be used for authentication with an ACR registry. See here for how to grant the right access here: [Authenticate with Azure Container Registry from Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-auth-aks)
 
-#### Run the deployment 
+#### Run the deployment
 The deployment will build the docker container and upload the container image to your referenced ACR instance (Note: Specify the ACR Login Server in the --registry parameter this is usually of the form <container_registry_name>.azurecr.io) and then your AKS cluster will use that as a source to obtain the container and deploy it.
 
 ```bash
@@ -263,7 +262,7 @@ If the deployment is successful, you should see this:
 Function deployed successfully!
 Function IP: 40.121.21.192
 
-#### Verifying your deployment 
+#### Verifying your deployment
 You can verify your deployment by using the Kubernetes web dashboard. To start the Kubernetes dashboard, use the [az aks browse](https://docs.microsoft.com/en-us/cli/azure/aks?view=azure-cli-latest#az-aks-browse) command.
 
 ```azurecli

src/Azure.Functions.Cli/Actions/KubernetesActions/InstallKedaAction.cs

@@ -14,18 +14,15 @@
 
 namespace Azure.Functions.Cli.Actions.KubernetesActions
 {
-    [Action(Name = "install", Context = Context.Kubernetes, HelpText = "Install Keda (non-http scale to zero) and Osiris (http scale to zero) in the kubernetes cluster from kubectl config")]
+    [Action(Name = "install", Context = Context.Kubernetes, HelpText = "Install Keda (non-http scale to zero) in the kubernetes cluster from kubectl config")]
     internal class DeployKedaAction : BaseAction
     {
         public string Namespace { get; private set; } = "default";
-        public bool KedaOnly { get; private set; }
         public bool DryRun { get; private set; }
 
         public override ICommandLineParserResult ParseArgs(string[] args)
         {
             SetFlag<string>("namespace", "Kubernetes namespace to deploy to. Default: default", s => Namespace = s);
-            SetFlag<bool>("keda", "Install Keda only. By default both keda (non-http scale to zero) and osiris (http scale to zero) are installed", f => KedaOnly = f);
-            SetFlag<bool>("keda-only", string.Empty, f => KedaOnly = f);
             SetFlag<bool>("dry-run", "Show the deployment template", f => DryRun = f);
             return base.ParseArgs(args);
         }
@@ -35,26 +32,15 @@ public async override Task RunAsync()
             if (DryRun)
             {
                 ColoredConsole.WriteLine(KubernetesHelper.GetKedaResources(Namespace));
-                if (!KedaOnly)
-                {
-                    ColoredConsole.WriteLine(KubernetesHelper.GetOsirisResources(Namespace));
-                }
             }
             else
             {
-                var sb = new StringBuilder();
-                sb.AppendLine(KubernetesHelper.GetKedaResources(Namespace));
-                if (!KedaOnly)
-                {
-                    sb.AppendLine(KubernetesHelper.GetOsirisResources(Namespace));
-                }
-
                 if (!await KubernetesHelper.NamespaceExists(Namespace))
                 {
                     await KubernetesHelper.CreateNamespace(Namespace);
                 }
 
-                await KubectlHelper.KubectlApply(sb.ToString(), showOutput: true);
+                await KubectlHelper.KubectlApply(KubernetesHelper.GetKedaResources(Namespace), showOutput: true);
             }
         }
     }

src/Azure.Functions.Cli/Actions/KubernetesActions/RemoveKedaAction.cs

@@ -5,7 +5,7 @@
 
 namespace Azure.Functions.Cli.Actions.KubernetesActions
 {
-    [Action(Name = "remove", Context = Context.Kubernetes, HelpText = "Remove Keda (non-http scale to zero) and Osiris (http scale to zero) from the kubernetes")]
+    [Action(Name = "remove", Context = Context.Kubernetes, HelpText = "Remove Keda (non-http scale to zero) from the kubernetes")]
     internal class RemoveKedaAction : BaseAction
     {
         public string Namespace { get; private set; } = "default";

src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

@@ -90,9 +90,6 @@
     <EmbeddedResource Include="StaticResources\print-functions.sh">
       <LogicalName>$(AssemblyName).print-functions.sh</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="StaticResources\osiris.yaml">
-      <LogicalName>$(AssemblyName).osiris.yaml</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="StaticResources\keda.yaml">
       <LogicalName>$(AssemblyName).keda.yaml</LogicalName>
     </EmbeddedResource>

src/Azure.Functions.Cli/Kubernetes/KubernetesHelpers.cs

@@ -78,56 +78,12 @@ public static void ValidateKubernetesName(string name)
             }
         }
 
-        internal static string GetOsirisResources(string @namespace)
-        {
-            var injectorCaCert = SecurityHelpers.CreateCACertificate("osiris-proxy-injector-ca");
-            var hijackerCaCert = SecurityHelpers.CreateCACertificate("osiris-endpoints-hijacker-ca");
-
-            var injectorAltNames = new[]
-            {
-                $"osiris-osiris-edge-proxy-injector.{@namespace}",
-                $"osiris-osiris-edge-proxy-injector.{@namespace}.svc",
-                $"osiris-osiris-edge-proxy-injector.{@namespace}.svc.cluster",
-                $"osiris-osiris-edge-proxy-injector.{@namespace}.svc.cluster.local",
-            };
-
-            var hijackerAltnames = new[]
-            {
-                $"osiris-osiris-edge-endpoints-hijacker.{@namespace}",
-                $"osiris-osiris-edge-endpoints-hijacker.{@namespace}.svc",
-                $"osiris-osiris-edge-endpoints-hijacker.{@namespace}.svc.cluster",
-                $"osiris-osiris-edge-endpoints-hijacker.{@namespace}.svc.cluster.local",
-            };
-
-            var injectorTlsCert = SecurityHelpers.CreateCertificateFromCA(injectorCaCert, "osiris-osiris-edge-proxy-injector", injectorAltNames);
-            var hijackerTlsCert = SecurityHelpers.CreateCertificateFromCA(hijackerCaCert, "osiris-osiris-edge-endpoints-hijacker", hijackerAltnames);
-
-            var caCertForEdgePointHijacker = SecurityHelpers.GetPemCert(hijackerCaCert);
-            var tlsCertForEdgeEndpointHijacker = SecurityHelpers.GetPemCert(hijackerTlsCert);
-            var tlsKeyForEdgeEndpointHijacker = SecurityHelpers.GetPemRsaKey(hijackerTlsCert);
-
-            var caCertForProxyInjector = SecurityHelpers.GetPemCert(injectorCaCert);
-            var tlsCertForProxyInjector = SecurityHelpers.GetPemCert(injectorTlsCert);
-            var tlsKeyForProxyInjector = SecurityHelpers.GetPemRsaKey(injectorTlsCert);
-
-            return StaticResources
-                .OsirisTemplate
-                .Result
-                .Replace("OSIRIS_NAMESPACE_PLACEHOLDER", @namespace)
-                .Replace("TLS_CERT_FOR_EDGE_ENDPOINTS_HIJACKER", tlsCertForEdgeEndpointHijacker)
-                .Replace("TLS_KEY_FOR_EDGE_ENDPOINTS_HIJACKER", tlsKeyForEdgeEndpointHijacker)
-                .Replace("CA_CERT_FOR_EDGE_ENDPOINT_HIJACKER", caCertForEdgePointHijacker)
-                .Replace("TLS_CERT_FOR_EDGE_PROXY_INJECTOR", tlsCertForProxyInjector)
-                .Replace("TLS_KEY_FOR_EDGE_PROXY_INJECTOR", tlsKeyForProxyInjector)
-                .Replace("CA_CERT_FOR_EDGE_PROXY_INJECTOR", caCertForProxyInjector);
-        }
-
         internal static async Task<bool> NamespaceExists(string @namespace)
         {
             (_, _, var exitCode) = await KubectlHelper.RunKubectl($"get namespace {@namespace}", ignoreError: true, showOutput: false);
             return exitCode == 0;
         }
-		
+
         internal static async Task<(string, bool)> ResourceExists(string resourceTypeName, string resourceName, string @namespace, bool returnJsonOutput = false)
         {
             var cmd = $"get {resourceTypeName} {resourceName} --namespace {@namespace}";
@@ -185,17 +141,9 @@ internal static string GetKedaResources(string @namespace)
                 //Environment variables for the func app keys kubernetes secret
                 var kubernetesSecretEnvironmentVariable = FuncAppKeysHelper.FuncKeysKubernetesEnvironVariables(keysSecretCollectionName, mountKeysAsContainerVolume);
                 var additionalEnvVars = enabledFunctions.Concat(kubernetesSecretEnvironmentVariable).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-                var deployment = GetDeployment(name + "-http", @namespace, imageName, pullSecret, 1, additionalEnvVars, new Dictionary<string, string>
-                {
-                    { "osiris.deislabs.io/enabled", "true" },
-                    { "osiris.deislabs.io/minReplicas", "1" }
-                }, port: 80);
+                var deployment = GetDeployment(name + "-http", @namespace, imageName, pullSecret, 1, additionalEnvVars, port: 80);
                 deployments.Add(deployment);
-                var service = GetService(name + "-http", @namespace, deployment, serviceType, new Dictionary<string, string>
-                {
-                    { "osiris.deislabs.io/enabled", "true" },
-                    { "osiris.deislabs.io/deployment", deployment.Metadata.Name }
-                });
+                var service = GetService(name + "-http", @namespace, deployment, serviceType);
                 result.Add(service);
             }
 
@@ -213,7 +161,7 @@ internal static string GetKedaResources(string @namespace)
             {
                 secrets[Constants.FunctionsWorkerRuntime] = GlobalCoreToolsSettings.CurrentWorkerRuntime.ToString();
             }
-			
+
             int resourceIndex = 0;
             if (useConfigMap)
             {

src/Azure.Functions.Cli/StaticResources/StaticResources.cs

@@ -69,7 +69,6 @@ private static async Task<string> GetValue(string name)
 
         public static Task<string> PrintFunctionJson => GetValue("print-functions.sh");
 
-        public static Task<string> OsirisTemplate => GetValue("osiris.yaml");
 
         public static Task<string> KedaTemplate => GetValue("keda.yaml");