Merge branch 'main' into egomes/add-more-k8s-resources

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.3.3](https://github.com/kurtosis-tech/kardinal/compare/0.3.2...0.3.3) (2024-10-02)
+
+
+### Features
+
+* add the `id` flag in the kardinal flow create cmd ([#261](https://github.com/kurtosis-tech/kardinal/issues/261)) ([09309f1](https://github.com/kurtosis-tech/kardinal/commit/09309f173e11c6d4d2b7b8a80f55df759fb98406))
+
+## [0.3.2](https://github.com/kurtosis-tech/kardinal/compare/0.3.1...0.3.2) (2024-09-28)
+
+
+### Bug Fixes
+
+* add the --service flag in the kardinal flow telepresence intercept command ([#259](https://github.com/kurtosis-tech/kardinal/issues/259)) ([5d22282](https://github.com/kurtosis-tech/kardinal/commit/5d222824139e0b9597f94cb0b4cd0663e948e413))
+* fix broken website CSS by refactoring styled-components SSR logic ([#257](https://github.com/kurtosis-tech/kardinal/issues/257)) ([505e885](https://github.com/kurtosis-tech/kardinal/commit/505e88504d020ed1c53ae6f4d018db85b86d1e1c))
+
 ## [0.3.1](https://github.com/kurtosis-tech/kardinal/compare/0.3.0...0.3.1) (2024-09-27)
 
 

README.md

@@ -79,7 +79,7 @@ kardinal deploy -k ./obd-kardinal.yaml
 
 You can view the frontend of the demo app by going to:
 
-`http://prod.app.localhost`
+`http://baseline.app.localhost`
 
 Feel free to click around, add items to your cart, and shop!
 

kardinal-cli/cmd/root.go

@@ -82,6 +82,7 @@ var (
 	templateYamlFile       string
 	templateDescription    string
 	templateArgsFile       string
+	flowID                 string
 )
 
 var rootCmd = &cobra.Command{
@@ -389,9 +390,9 @@ var telepresenceInterceptCmd = &cobra.Command{
 		}
 		logrus.Infof("Telepresence has been successfully connected to namespace '%s'...", namespaceName)
 
-		logrus.Infof("Executing Telepresence intercept to flow id '%s'...", namespaceName)
+		logrus.Infof("Executing Telepresence intercept to flow id '%s'...", flowId)
 
-		telepresenceInterceptCmdArgs := []string{"intercept", interceptBaseName, "--port", fmt.Sprintf("%s:http", localPort)}
+		telepresenceInterceptCmdArgs := []string{"intercept", "--port", fmt.Sprintf("%s:http", localPort), "--service", interceptBaseName, interceptBaseName}
 		telepresenceInterceptCmd := exec.Command(telepresenceCmdName, telepresenceInterceptCmdArgs...)
 		telepresenceInterceptOutput, err := telepresenceInterceptCmd.CombinedOutput()
 		logrus.Infof("Telepresence intercept command output: %s", string(telepresenceInterceptOutput))
@@ -642,6 +643,7 @@ func init() {
 	createCmd.Flags().StringSliceVarP(&serviceImagePairs, "service-image", "s", []string{}, "Extra service and respective image to include in the same flow (can be used multiple times)")
 	createCmd.Flags().StringVarP(&templateName, "template", "t", "", "Template name to use for the flow creation")
 	createCmd.Flags().StringVarP(&templateArgsFile, "template-args", "a", "", "JSON with the template arguments or path to YAML file containing template arguments")
+	createCmd.Flags().StringVarP(&flowID, "ID", "i", "", "Set the flow id")
 
 	deployCmd.PersistentFlags().StringVarP(&kubernetesManifestFile, "k8s-manifest", "k", "", "Path to the K8S manifest file")
 	deployCmd.MarkPersistentFlagRequired("k8s-manifest")
@@ -859,6 +861,7 @@ func createDevFlow(tenantUuid api_types.Uuid, pairsMap map[string]string, templa
 	}
 
 	resp, err := client.PostTenantUuidFlowCreateWithResponse(ctx, tenantUuid, api_types.PostTenantUuidFlowCreateJSONRequestBody{
+		FlowId:       &flowID,
 		FlowSpec:     devSpec,
 		TemplateSpec: templateSpec,
 	})