diff --git a/.gitignore b/.gitignore index 97f3f0d12..3e09accd5 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ kubeless-openshift.yaml kubeless-non-rbac.yaml kubeless.yaml kafka-zookeeper.yaml +kafka-zookeeper-openshift.yaml diff --git a/.travis.yml b/.travis.yml index 406ac7621..eff8343dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -195,6 +195,7 @@ before_deploy: sed 's/'":${CONTROLLER_TAG}"'/'"@$NEW_DIGEST"'/g' kubeless-non-rbac.yaml > kubeless-non-rbac-${TRAVIS_TAG}.yaml sed 's/'":${CONTROLLER_TAG}"'/'"@$NEW_DIGEST"'/g' kubeless-openshift.yaml > kubeless-openshift-${TRAVIS_TAG}.yaml cp kafka-zookeeper.yaml kafka-zookeeper-${TRAVIS_TAG}.yaml + cp kafka-zookeeper-openshift.yaml kafka-zookeeper-openshift-${TRAVIS_TAG}.yaml fi deploy: @@ -207,6 +208,7 @@ deploy: - kubeless-non-rbac-${TRAVIS_TAG}.yaml - kubeless-openshift-${TRAVIS_TAG}.yaml - kafka-zookeeper-${TRAVIS_TAG}.yaml + - kafka-zookeeper-openshift-${TRAVIS_TAG}.yaml - bundles/kubeless_*.zip skip_cleanup: true overwrite: true diff --git a/Makefile b/Makefile index b63d6eed0..2e17daa3a 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ binary-cross: $(KUBECFG) show -o yaml $< > $@.tmp mv $@.tmp $@ -all-yaml: kubeless.yaml kubeless-non-rbac.yaml kubeless-openshift.yaml kafka-zookeeper.yaml +all-yaml: kubeless.yaml kubeless-non-rbac.yaml kubeless-openshift.yaml kafka-zookeeper.yaml kafka-zookeeper-openshift.yaml kubeless.yaml: kubeless.jsonnet diff --git a/kafka-zookeeper-openshift.jsonnet b/kafka-zookeeper-openshift.jsonnet new file mode 100644 index 000000000..5db8662c3 --- /dev/null +++ b/kafka-zookeeper-openshift.jsonnet @@ -0,0 +1,10 @@ +local k = import "ksonnet.beta.1/k.libsonnet"; + +local manifest = import "kafka-zookeeper.jsonnet"; + +manifest + { + kafkaSts+: + {spec+: {template+: {spec+: {initContainers: []}}}}, + zookeeperSts+: + {spec+: {template+: {spec+: {initContainers: []}}}}, +} \ No newline at end of file diff --git a/script/upload_release_notes.sh b/script/upload_release_notes.sh index 47ddafe06..5c1242438 100755 --- a/script/upload_release_notes.sh +++ b/script/upload_release_notes.sh @@ -24,26 +24,28 @@ To install this latest version, use the manifest that is part of the release:\\n \\n\ \`\`\`console\\n\ kubectl create ns kubeless\\n\ -curl -sL https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-$tag.yaml | kubectl create -f -\\n\ +kubectl create -f https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-$tag.yaml \\n\ \`\`\`\\n\ \\n\ **WITHOUT RBAC:**\\n\ \\n\ \`\`\`console\\n\ kubectl create ns kubeless\\n\ -curl -sL https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-non-rbac-$tag.yaml | kubectl create -f -\\n\ +kubectl create -f https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-non-rbac-$tag.yaml \\n\ \`\`\`\\n\ **KAFKA:**\\n\ \\n\ \`\`\`console\\n\ kubectl create ns kubeless\\n\ -curl -sL https://github.com/kubeless/kubeless/releases/download/$tag/kafka-zookeeper-$tag.yaml | kubectl create -f -\\n\ +kubectl create -f https://github.com/kubeless/kubeless/releases/download/$tag/kafka-zookeeper-$tag.yaml \\n\ \`\`\`\\n\ **OPENSHIFT:**\\n\ \\n\ \`\`\`console\\n\ oc create ns kubeless\\n\ -curl -sL https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-openshift-$tag.yaml | oc create -f -\\n\ +oc create -f https://github.com/kubeless/kubeless/releases/download/$tag/kubeless-openshift-$tag.yaml \\n\ +# Kafka +oc create -f https://github.com/kubeless/kubeless/releases/download/$tag/kafka-zookeeper-openshift-$tag.yaml \\n\ \`\`\`\\n\ ") echo "${notes}"