Bump Arktos to v1.0 (#1409)

* Bump Arktos to v0.10.0 * update mizar version * update mizar to v0.91 * update mizar to v0.91 * Change mizar version to 0.91 (#1411) * Bump Arktos version to 1.0 * Use unified mizar release link. Co-authored-by: sonyafenge <45471193+sonyafenge@users.noreply.github.com>
CentaurusInfra · Mar 15, 2022 · 391c199 · 391c199
1 parent af76a8c
commit 391c199
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -94,7 +94,7 @@ NETWORK_PROVIDER="${NETWORK_PROVIDER:-cni}" # none, kubenet doesn't work with co
 NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-flannel}" # calico kubenet doesn't work with container runtime, update to cni and flannel
 
 if [[ "${NETWORK_PROVIDER:-}" == "mizar" ]]; then
-  NETWORK_PROVIDER_VERSION="dev"
+  NETWORK_PROVIDER_VERSION="0.91"
   NETWORK_POLICY_PROVIDER="mizar"
   CNI_BIN_DIR="/opt/cni/bin"
   KUBE_CONTAINER_RUNTIME="docker"

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -95,7 +95,7 @@ fi
 NETWORK_PROVIDER="${NETWORK_PROVIDER:-cni}" # none, kubenet doesn't work with container runtime, update to cni and flannel
 
 if [[ "${NETWORK_PROVIDER:-}" == "mizar" ]]; then
-  NETWORK_PROVIDER_VERSION="dev"
+  NETWORK_PROVIDER_VERSION="0.91"
   NETWORK_POLICY_PROVIDER="mizar"
   CNI_BIN_DIR="/opt/cni/bin"
   KUBE_CONTAINER_RUNTIME="docker"

diff --git a/hack/arktos-up-scale-out-poc.sh b/hack/arktos-up-scale-out-poc.sh
@@ -47,7 +47,6 @@ TENANT_SERVER=${TENANT_SERVER:-}
 RESOURCE_SERVER=${RESOURCE_SERVER:-}
 IS_SCALE_OUT=${IS_SCALE_OUT:-"true"}
 IS_SECONDARY_TP=${IS_SECONDARY_TP:-"false"}
-MIZAR_VERSION=${MIZAR_VERSION:-"dev"}
 
 echo "IS_RESOURCE_PARTITION: |${IS_RESOURCE_PARTITION}|"
 echo "TENANT_SERVER: |${TENANT_SERVER}|"

diff --git a/hack/arktos-up.sh b/hack/arktos-up.sh
@@ -556,8 +556,7 @@ fi
 # Applying mizar cni
 if [[ "${CNIPLUGIN}" == "mizar" ]]; then
   ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create configmap system-source --namespace=kube-system --from-literal=name=arktos --from-literal=company=futurewei
-  # ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f ${KUBE_ROOT}/hack/testdata/mizar/deploy.mizar.next.yaml 
-  ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f https://raw.githubusercontent.com/CentaurusInfra/mizar/dev-next/etc/deploy/deploy.mizar.dev.yaml
+  ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f https://github.com/CentaurusInfra/mizar/releases/download/v${MIZAR_VERSION}/deploy.mizar.yaml
 fi
 
 if [[ -n "${PSP_ADMISSION}" && "${AUTHORIZATION_MODE}" = *RBAC* ]]; then

diff --git a/hack/lib/common-var-init.sh b/hack/lib/common-var-init.sh
@@ -44,6 +44,7 @@ export ALLOW_PRIVILEGED=true
 # onebox has option to choose cni plugin: bridge(default), alktron(neutron integration), mizar
 CNIPLUGIN=${CNIPLUGIN:-"bridge"}
 
+MIZAR_VERSION=${MIZAR_VERSION:-"0.91"}
 VPC_RANGE_START=${VPC_RANGE_START:-11}
 VPC_RANGE_END=${VPC_RANGE_END:-99}
 

diff --git a/pkg/version/VERSION.sh b/pkg/version/VERSION.sh
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export KUBE_GIT_VERSION=v0.9.0
+export KUBE_GIT_VERSION=v1.0.0