diff --git a/beamline-chart/values.yaml b/beamline-chart/values.yaml index 54c5c12..b5b636e 100644 --- a/beamline-chart/values.yaml +++ b/beamline-chart/values.yaml @@ -1,7 +1,7 @@ # default values for all IOCs on bl38p # see end of file for values that may be overridden per individual IOC -beamline: bl38p +beamline: bl46p # we use the default service account in the namespace so leave this out # if you need to specify an alternative then uncomment below # serviceAccountName: k8s-p38-iocs @@ -84,3 +84,5 @@ resources: requests: cpu: 100m memory: 64Mi + + diff --git a/environment.sh b/environment.sh index f62bef6..c45f68b 100755 --- a/environment.sh +++ b/environment.sh @@ -19,7 +19,7 @@ echo "Loading IOC environment for bl46p ..." # use spaces to separate multiple mappings export EC_REGISTRY_MAPPING='github.com=ghcr.io' # the namespace to use for kubernetes deployments - use local for local docker/podman -export EC_K8S_NAMESPACE=local +export EC_K8S_NAMESPACE=p46-iocs # the git repo for this beamline (or accelerator domain) export EC_DOMAIN_REPO=git@github.com:subinsaji/bl46p.git # declare your centralised log server Web UI @@ -51,15 +51,15 @@ source <(ec --show-completion ${SHELL}) #### SECTION 3. Configure Kubernetes Cluster ################################### # example of how we set up a cluster at DLS is below # SET UP Connection to KUBERNETES CLUSTER and set default namespace. -# if module --version &> /dev/null; then -# if module avail k8s-ixx > /dev/null; then -# module unload k8s-ixx > /dev/null -# module load k8s-ixx > /dev/null -# # set the default namespace for kubectl and helm (for convenience only) -# kubectl config set-context --current --namespace=ixx-iocs -# # get running iocs: makes sure the user has provided credentials -# ec ps -# fi -# fi +if module --version &> /dev/null; then + if module avail pollux > /dev/null; then + module unload pollux > /dev/null + module load pollux > /dev/null + # set the default namespace for kubectl and helm (for convenience only) + kubectl config set-context --current --namespace=p46-iocs + # get running iocs: makes sure the user has provided credentials + ec ps + fi +fi