Adjust installation scripts to Kyma release 1.2.0-rc2 (#14)

KYMA_VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0-rc2

Makefile

@@ -1,3 +1,5 @@
+.PHONY: ci-pr ci-master ci-release master-build pr-build release
+
 master-build:
 	make -C initializer/ ci-master
 	make -C google-cloud/ ci-master

google-cloud/Makefile

@@ -1,5 +1,5 @@
-IMAGE_NAME ?= kyma-gc-deployer
-DOCKER_PUSH_REPOSITORY ?= eu.gcr.io/kyma-project/marketplaces
+IMAGE_NAME ?= kyma-gcp-marketplace
+DOCKER_PUSH_REPOSITORY ?= gcr.io/kyma-project
 DOCKER_TAG ?= latest
 IMAGE = $(DOCKER_PUSH_REPOSITORY)$(DOCKER_PUSH_DIRECTORY)/$(IMAGE_NAME):$(DOCKER_TAG)
 ARTIFACTS ?= out

google-cloud/manifest/application.yaml

@@ -26,20 +26,19 @@ spec:
       - description: "Kyma source code"
         url: https://github.com/kyma-project
     notes: |-
-      ### Access Kyma cluster:
-      To access your Kyma cluster, you need to import Kyma self-signed certificate to your trusted certificate authorities.
+      To access your Kyma cluster, import the Kyma self-signed certificate to your trusted certificate authorities.
       
-      #### MacOS
-      To do this on MacOS, paste this command in the command line, copy the certificate string, and run the command:
+      ### MacOS
+      Paste this command in the command line, copy the certificate string, and run the command:
       ```bash
       tmpfile=$(mktemp /tmp/temp-cert.XXXXXX) \
           && pbpaste > $tmpfile \
           && sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain $tmpfile \
           && rm $tmpfile
       ```
 
-      #### Windows
-      To do this on Windows, paste this command in the command line, copy the certificate string, and run the command as an Administrator:
+      ### Windows
+      Paste this command in the command line, copy the certificate string, and run the command as an Administrator:
       ```
       powershell "$(Get-Clipboard | Out-File -FilePath kyma.cer | Out-Host;$?) -and $(certutil -f -addstore Root kyma.cer | Out-Host;$?) -and $(Remove-Item -path kyma.cer | Out-Host;$?)"
       ```

initializer/Dockerfile

@@ -6,14 +6,12 @@ ARG INITIALIZER_VERSION
 ENV KYMA_VERSION ${KYMA_VERSION}
 ENV INITIALIZER_VERSION ${INITIALIZER_VERSION}
 ENV TILLER_RESOURCE "tiller.yaml"
-ENV KYMA_CONFIG_RESOURCE "kyma-config-cluster.yaml"
 ENV KYMA_INSTALLER_RESOURCE "kyma-installer-cluster.yaml"
 
 RUN mkdir -p /initializer/scripts
 WORKDIR /initializer
 
 RUN curl https://raw.githubusercontent.com/kyma-project/kyma/${KYMA_VERSION}/installation/resources/tiller.yaml --output ${TILLER_RESOURCE} --fail -L \
-    && curl https://github.com/kyma-project/kyma/releases/download/${KYMA_VERSION}/kyma-config-cluster.yaml --output ${KYMA_CONFIG_RESOURCE} --fail -L \
     && curl https://github.com/kyma-project/kyma/releases/download/${KYMA_VERSION}/kyma-installer-cluster.yaml --output ${KYMA_INSTALLER_RESOURCE} --fail -L
 
 COPY scripts/*  scripts/

initializer/Makefile

@@ -1,5 +1,5 @@
 IMAGE_NAME ?= kyma-initializer
-DOCKER_PUSH_REPOSITORY ?= eu.gcr.io/kyma-project/marketplaces
+DOCKER_PUSH_REPOSITORY ?= gcr.io/kyma-project
 DOCKER_TAG ?= latest
 IMAGE = $(DOCKER_PUSH_REPOSITORY)$(DOCKER_PUSH_DIRECTORY)/$(IMAGE_NAME):$(DOCKER_TAG)
 

initializer/README.md

@@ -23,4 +23,4 @@ IMAGE={image_name}:{image_tag} DOCKER_TAG={image_tag} make image-build
 The variables are:
 
 * `{image_name}` which is the name of the output image. Use `kyma-initializer` for the image name.
-* `{image_tag}` which is the tag of the output image. Use `latest` for the tag name.
+* `{image_tag}` which is the tag of the output image. Use `latest` for the tag name.

initializer/scripts/deploy.sh

@@ -55,15 +55,15 @@ metadata:
   labels:
     app.kubernetes.io/name: ${APPLICATION_NAME}
 data:
-  address: "${DOMAIN}"
+  address: "https://${DOMAIN}"
   email: "${EMAIL}"
 EOF
 }
 
 validateEnvironment() {
     local discoverUnsetVar=false
 
-    for var in APPLICATION_NAME NAMESPACE TILLER_RESOURCE KYMA_INSTALLER_RESOURCE KYMA_CONFIG_RESOURCE; do
+    for var in APPLICATION_NAME NAMESPACE TILLER_RESOURCE KYMA_INSTALLER_RESOURCE; do
         if [ -z "${!var}" ] ; then
             echo "ERROR: $var is not set"
             discoverUnsetVar=true
@@ -82,13 +82,9 @@ main() {
     kubectl apply -f "${TILLER_RESOURCE}"
 
     updateStatus "Pending" "Installing Kyma installator"
-    cat "${KYMA_INSTALLER_RESOURCE}" <(echo -e "\n---") "${KYMA_CONFIG_RESOURCE}" \
-        | sed -e "s/__PROMTAIL_CONFIG_NAME__/promtail-k8s-1-14.yaml/g" \
-        | sed -e "s/__.*__//g" \
-        | kubectl apply -f -
+    kubectl apply -f "${KYMA_INSTALLER_RESOURCE}"
 
     updateStatus "Pending" "Starting Kyma instalation"
-    kubectl label installation/kyma-installation action=install
 
     STATUS=Start
 

milv.config.yaml

@@ -1,7 +1,7 @@
 timeout: 60
 request-repeats: 5
 files:
-  - path: "./bundles/.github/ISSUE_TEMPLATE/security-vulnerability.md"
+  - path: "./marketplaces/.github/ISSUE_TEMPLATE/security-vulnerability.md"
     config:
       white-list-internal: ["{CVSS"]
       white-list-external: ["https://www.first.org/cvss/calculator/3.0#CVSS:3.0/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:L/A:N"]