Update suse customization process with V4 build

README.md

@@ -71,4 +71,3 @@ Tested with Browserstack
 ## License
 
 The work done has been licensed under Apache License 2.0. The license file can be found [here](LICENSE).
-

deploy/ci/tasks/dev-releases/create-chart-helper.sh

@@ -81,8 +81,8 @@ patchHelmChartAppVersion() {
   local CHART_PATH=$1
   local STRATOS_FOLDER=$2
 
-  if [ -f "${STRATOS_FOLDER}/custom-src/stratos.yaml" ]; then
-    PROD_VERSION=$(cat "${STRATOS_FOLDER}/custom-src/stratos.yaml" | grep "productVersion")
+  if [ -f "${STRATOS_FOLDER}/stratos.yaml" ]; then
+    PROD_VERSION=$(cat "${STRATOS_FOLDER}/stratos.yaml" | grep "productVersion")
     if [ ! -z "${PROD_VERSION}" ]; then
       PROD_VERSION=$(echo $PROD_VERSION | grep --extended --only-matching '[0-9\.]+')
       if [ ! -z "${PROD_VERSION}" ]; then

deploy/ci/tasks/dev-releases/create-chart.yml

@@ -38,9 +38,9 @@ run:
       updateHelmDependency
 
       # Run customization script if there is one
-      if [ -f "${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
+      if [ -f "${STRATOS}/deploy/kubernetes/custom/customize-helm.sh" ]; then
         echo "Applying Helm Chart customizations"
-        ${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS}/deploy/kubernetes/console"
+        ${STRATOS}/deploy/kubernetes/custom/customize-helm.sh "${STRATOS}/deploy/kubernetes/console"
       fi
 
       # Generate imagelist

deploy/kubernetes/build.sh

@@ -137,8 +137,8 @@ __DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 STRATOS_PATH=${__DIRNAME}/../../
 source "${STRATOS_PATH}/deploy/common-build.sh"
 
-if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh" ]; then
-  source "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh"
+if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh" ]; then
+  source "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh"
   HAS_CUSTOM_BUILD="true"
 fi
 
@@ -238,9 +238,9 @@ rm -rf "${DEST_HELM_CHART_PATH}/**/*.orig"
 
 # Run customization script if there is one
 # This can do things like provide a custom __stratos.tpl file
-if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
+if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
-  "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" "${DEST_HELM_CHART_PATH}"
+  "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" "${DEST_HELM_CHART_PATH}"
 fi
 
 # Fetch subcharts

deploy/kubernetes/console/Chart.yaml

@@ -5,4 +5,4 @@ version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://github.com/cloudfoundry/stratos/raw/master/deploy/kubernetes/console/icon.png
+icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png

custom-src/deploy/kubernetes/customize-helm.sh → deploy/kubernetes/custom/customize-helm.sh

@@ -30,8 +30,8 @@ echo -e "${CYAN}Patching Chart.yaml${RESET}"
 sed -i.bak -e 's@https://github.com/cloudfoundry/stratos@https://github.com/SUSE/stratos@g' ${CHART_PATH}/Chart.yaml
 
 # Change the URL of the icon to be the SUSE one
-ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png"
-SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/custom-src/deploy/kubernetes/icon.png"
+ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png"
+SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/master/deploy/kubernetes/custom/icon.png"
 sed -i.bak -e 's@'"${ICON_URL}"'@'"${SUSE_ICON_URL}"'@g' ${CHART_PATH}/Chart.yaml
 
 SRC="A Helm chart for deploying Stratos UI Console"

deploy/kubernetes/imagelist-gen.sh

@@ -17,9 +17,9 @@ STRATOS_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../../ && pwd )"
 # Add any customizations
 function addCustomizations() {
 
-  if [ -f "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" ];then
+  if [ -f "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" ];then
     echo "Including custom imagelist contents"
-    cat "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" >> ./imagelist.txt
+    cat "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" >> ./imagelist.txt
 
     # Update version number
     VERSION=$(grep -Po 'consoleVersion: \K(.*)' ./values.yaml)

docs/customizing.md

@@ -24,7 +24,7 @@ To aid in migrating we've provided these instructions.
 1) Check that your ts config file defines the public api file.
     - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
 1) Check that your new package's package.json defines your custom module and if application custom-routing module.
-    - See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section.
+    - See `src/frontend/packages/custom_extensions/package.json` file's `stratos` section.
     - Note your `routingModule` entry label should not have a preceding `_`.
 1) Build Stratos in your usual way, for instance `npm run build`.
     - It could be that this fails due to TypeScript import issues, if so go through these and fix.