Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Support Power processor arch for CP4BA #317

Merged
merged 2 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/argocd-cloudpaks/cp4a/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.5.0
version: 0.5.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.6.2
appVersion: 0.6.3
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: config
image: quay.io/openshift/origin-cli:latest
image: registry.redhat.io/openshift4/ose-cli:latest
imagePullPolicy: IfNotPresent
env:
- name: ARGOCD_APP_NAME
Expand Down Expand Up @@ -41,9 +41,24 @@ spec:
argo_cmd="${HOME}/argocd"
result=0

linux_arch=$(uname -p)
argocd_cli_arch=amd64
if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
argocd_cli_arch=${linux_arch}
fi

argo_url=$(oc get route ${argo_route} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.spec.host}') \
&& curl -skL "${argo_url}/download/argocd-linux-amd64" -o "${argo_cmd}" \
&& chmod 755 "${argo_cmd}" \
&& cli_status=$(curl -skL "${argo_url}/download/argocd-linux-${argocd_cli_arch}" \
-o "${argo_cmd}" \
-w "%{http_code}") \
|| result=1

if [ "${cli_status}" != "200" ]; then
echo "ERROR: Unable to download argocd client."
exit 2
fi

chmod 755 "${argo_cmd}" \
&& argo_pwd=$(oc get secret ${argo_secret} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.data.admin\.password}' | base64 -d ; echo ) \
&& "${argo_cmd}" login "${argo_url}" --username admin --password "${argo_pwd}" --insecure \
&& "${argo_cmd}" app set "${ARGOCD_APP_NAME}" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,8 @@ spec:
spec:
containers:
- name: config
image: quay.io/openshift/origin-cli:latest
image: registry.redhat.io/openshift4/ose-cli:latest
imagePullPolicy: IfNotPresent
resources:
requests:
memory: "64Mi"
cpu: "250m"
limits:
memory: "96Mi"
cpu: "300m"
env:
- name: ARGOCD_APP_NAME
value: cp4a-app
Expand Down Expand Up @@ -54,9 +47,24 @@ spec:
argo_cmd="${HOME}/argocd"
result=0

linux_arch=$(uname -p)
argocd_cli_arch=amd64
if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
argocd_cli_arch=${linux_arch}
fi

argo_url=$(oc get route ${argo_route} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.spec.host}') \
&& curl -skL "${argo_url}/download/argocd-linux-amd64" -o "${argo_cmd}" \
&& chmod 755 "${argo_cmd}" \
&& cli_status=$(curl -skL "${argo_url}/download/argocd-linux-${argocd_cli_arch}" \
-o "${argo_cmd}" \
-w "%{http_code}") \
|| result=1

if [ "${cli_status}" != "200" ]; then
echo "ERROR: Unable to download argocd client."
exit 2
fi

chmod 755 "${argo_cmd}" \
&& argo_pwd=$(oc get secret ${argo_secret} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.data.admin\.password}' | base64 -d ; echo ) \
&& "${argo_cmd}" login "${argo_url}" --username admin --password "${argo_pwd}" --insecure \
|| result=1
Expand Down
2 changes: 1 addition & 1 deletion config/cloudpaks/cp4a/operators/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.1
version: 0.7.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,8 @@ spec:
spec:
containers:
- name: config
image: quay.io/openshift/origin-cli:latest
image: registry.redhat.io/openshift4/ose-cli:latest
imagePullPolicy: IfNotPresent
resources:
requests:
memory: "256Mi"
cpu: "200m"
limits:
memory: "256Mi"
cpu: "250m"
env:
- name: ARGOCD_NAMESPACE
value: openshift-gitops
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@ spec:
spec:
containers:
- name: config
image: quay.io/openshift/origin-cli:latest
image: registry.redhat.io/openshift4/ose-cli:latest
imagePullPolicy: IfNotPresent
resources:
requests:
memory: "192Mi"
cpu: "250m"
limits:
memory: "256Mi"
cpu: "400m"
env:
- name: TARGET_NAMESPACE
value: "{{.Values.argocd_app_namespace}}"
Expand Down
2 changes: 1 addition & 1 deletion tests/postbuild/cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ oc_cmd=$(type -p oc)

: "${NEW_CLUSTER_TYPE:=fyre-quick-burn}"
: "${WORKER_FLAVOR:=medium}"
: "${OCP_VERSION:=4.14}"
: "${OCP_VERSION:=4.12}"

# In hours
: "${CLUSTER_EXPIRATION:=12}"
Expand Down
Loading