Merge pull request #130 from lpabon/component-install-again

Component install again

Author: lpabon

.travis.yml

@@ -9,4 +9,4 @@ script:
   - make install
   - make test
   - make docs
-  - cd example-component && make verify
+  - cd example-component/golang && make verify

Makefile

@@ -74,7 +74,7 @@ test:
 verify: all test
 	go fmt $(go list ./... | grep -v vendor) | wc -l | grep 0
 	go vet $(go list ./... | grep -v vendor)
-	$(MAKE) -C example-component verify
+	$(MAKE) -C example-component/golang verify
 
 $(PLUGIN_PKG_NAME): pxc
 	cp pxc $(PLUGIN_PKG_NAME)

example-component/bash/pxc-install

@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Copyright © 2020 Portworx
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Example installer for components
+#
+
+if [ $# -lt 1 ] ; then
+	echo "Must supply a url or filename"
+	exit 1
+fi
+STAGING_DIR=/tmp/pxc-staging
+plugin=$STAGING_DIR/pxc-plugin.tar.gz
+
+mkdir -p $STAGING_DIR
+
+if echo $1 | egrep "^http://|^https://" > /dev/null 2>&1 ; then
+	echo "--> Downloading"
+	curl -L -s -o $STAGING_DIR/pxc-plugin.tar.gz $1
+else
+	if [ ! -f $1 ] ; then
+		echo "File $1 does not exist"
+	fi
+	cp $1 $plugin
+fi
+
+echo "--> Unpacking"
+( cd $STAGING_DIR ; tar xzf $plugin )
+
+echo "--> Installing"
+( cd $STAGING_DIR ; cp -r */* $HOME/.pxc )
+
+echo "Done"
+
+rm -rf $STAGING_DIR

example-component/bash/pxc-shellenv

@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Copyright © 2020 Portworx
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Shows PXC environment variables
+#
+env | grep PXC

example-component/bash/pxc-status

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright © 2020 Portworx
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Emulate pxctl status
+#
+
+id=$(kubectl pxc node list -o json | jq -r '.[].id' | head -1)
+kubectl pxc node describe $id
+kubectl pxc cluster describe

example-component/Makefile example-component/golang/Makefile

@@ -8,6 +8,8 @@ VER := $(shell git describe --tags)
 ARCH := $(shell go env GOARCH)
 GOOS := $(shell go env GOOS)
 DIR=.
+TMP=$(DIR)/tmp
+PKGDIR=$(TMP)/$(PXC_COMPONENT)
 
 ifdef APP_SUFFIX
   VERSION = $(VER)-$(subst /,-,$(APP_SUFFIX))
@@ -82,20 +84,24 @@ $(COMPONENT_PKG_NAME): $(PKG_NAME)
 
 $(ZIPPACKAGE): all
 	@echo Packaging binaries...
+	@mkdir -p $(PKGDIR)/bin
+	@cp $(COMPONENT_PKG_NAME) $(PKGDIR)/bin
 	@mkdir -p dist
-	@zip dist/$@ $(COMPONENT_PKG_NAME)
-	@rm -f $(PKG_NAME)
+	( cd $(DIR)/tmp && zip -r ../dist/$@ $(PXC_COMPONENT) )
+	@rm -rf $(TMP)
+	@rm -f $(PKG_NAME) $(COMPONENT_PKG_NAME) $(CLINAME).exe $(PXC_COMPONENT).exe
 
 $(TGZPACKAGE): all
 	@echo Packaging binaries...
-	@mkdir -p tmp/$(PKG_NAME)
-	@cp $(COMPONENT_PKG_NAME) tmp/$(PKG_NAME)/
+	@mkdir -p $(PKGDIR)/bin
+	@cp $(COMPONENT_PKG_NAME) $(PKGDIR)/bin
 	@mkdir -p $(DIR)/dist/
-	tar -czf $(DIR)/dist/$@ -C tmp $(PKG_NAME)
-	@rm -rf tmp
+	tar -czf $(DIR)/dist/$@ -C $(DIR)/tmp $(PXC_COMPONENT)
+	@rm -rf $(TMP)
+	@rm -f $(PKG_NAME) $(COMPONENT_PKG_NAME) $(CLINAME).exe $(PXC_COMPONENT).exe
 
 clean:
-	rm -f $(PKG_NAME) $(COMPONENT_PKG_NAME)
+	rm -f $(PKG_NAME) $(COMPONENT_PKG_NAME) $(CLINAME).exe $(PXC_COMPONENT).exe
 	rm -rf dist
 
 .PHONY: dist all clean darwin_amd64_dist windows_amd64_dist linux_amd64_dist \

example-component/handler/cluster/doc.go example-component/golang/handler/cluster/doc.go

@@ -16,5 +16,5 @@ limitations under the License.
 package handler
 
 import (
-	_ "github.com/portworx/pxc/example-component/handler/cluster"
+	_ "github.com/portworx/pxc/example-component/golang/handler/cluster"
 )

example-component/handler/cluster/show.go example-component/golang/handler/cluster/show.go

@@ -16,7 +16,7 @@ limitations under the License.
 package main
 
 import (
-	_ "github.com/portworx/pxc/example-component/handler"
+	_ "github.com/portworx/pxc/example-component/golang/handler"
 	pxc "github.com/portworx/pxc/pkg/component"
 )