Merge pull request #64 from rancher/ci

Update images for 0.1.1 release
rancher · Jun 18, 2021 · 0c9dd92 · 0c9dd92
2 parents 4ab1f07 + cc8f14a
commit 0c9dd92
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -23,29 +23,31 @@ steps:
   when:
     event:
     - tag
+    instance:
+    - drone-publish.rancher.io
     ref:
-    - refs/head/operator
-    - refs/head/ci
+    - refs/head/main
     - refs/tags/*
 
-- name: publish-dockerhub
-  image: plugins/docker
-  settings:
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    context: package/
-    dockerfile: package/Dockerfile
-    repo: rancher/opni-manager
-    tag: ${DRONE_TAG}
-  when:
-    event:
-    - tag
-    refs:
-    - refs/head/operator
-    - refs/head/ci
-    - refs/tags/*
+#- name: publish-dockerhub
+#  image: plugins/docker
+#  settings:
+#    password:
+#      from_secret: docker_password
+#    username:
+#      from_secret: docker_username
+#    context: package/
+#    dockerfile: package/Dockerfile
+#    repo: rancher/opni-manager
+#    tag: ${DRONE_TAG}
+#  when:
+#    event:
+#    - tag
+#    instance:
+#    - drone-publish.rancher.io
+#    refs:
+#    - refs/head/main
+#    - refs/tags/*
 
 - name: publish-bin-artifacts
   image: plugins/github-release
@@ -59,9 +61,10 @@ steps:
   when:
     event:
     - tag
+    instance:
+    - drone-publish.rancher.io
     ref:
-    - refs/head/operator
-    - refs/head/ci
+    - refs/head/main
     - refs/tags/*
 
 volumes:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -12,4 +12,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: rancher/opni-manager:v0.1.0-rc4
+  newName: joekralicky/opni-manager:v0.1.1
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -27,7 +27,7 @@ spec:
             - /manager
           args:
             - --leader-elect
-          image: controller:latest
+          image: controller
           name: manager
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/pkg/demo/services.go b/pkg/demo/services.go
@@ -22,12 +22,13 @@ import (
 
 const (
 	KibanaDashboardPodName           = "deploy-opni-kibana-dasbhboards"
-	DrainServiceImage                = "sanjayrancher/drain-service:v0.1-dev"
-	NulogInfServiceControlPlaneImage = "sanjayrancher/nulog-inference-service:v0.1-dev"
-	NulogInfServiceImage             = "sanjayrancher/nulog-inference-service:v0.1-dev"
-	PayloadReceiverServiceImage      = "sanjayrancher/payload-receiver-service:v0.1-dev"
-	TrainingControllerImage          = "sanjayrancher/training-controller:v0.1-dev"
-	PreprocessingServiceImage        = "quay.io/dbason/opni-preprocessing-service:v0"
+	DrainServiceImage                = "rancher/opni-drain-service:v0.1.1"
+	NulogInfServiceControlPlaneImage = "rancher/opni-inference-service:v0.1.1"
+	NulogInfServiceImage             = "rancher/opni-inference-service:v0.1.1"
+	PayloadReceiverServiceImage      = "rancher/opni-payload-receiver-service:v0.1.1"
+	TrainingControllerImage          = "rancher/opni-training-controller:v0.1.1"
+	PreprocessingServiceImage        = "rancher/opni-preprocessing-service:v0.1.1"
+	KibanaDashboardImage             = "rancher/opni-kibana-dashboard:v0.1.1"
 )
 
 func BuildDrainService(spec *demov1alpha1.OpniDemo) *appsv1.Deployment {
@@ -562,7 +563,7 @@ func BuildKibanaDashboardPod(spec *demov1alpha1.OpniDemo) *v1.Pod {
 			Containers: []v1.Container{
 				{
 					Name:            "kibana-dashboard",
-					Image:           "quay.io/dbason/opni-kibana-dashboard:controlplane",
+					Image:           KibanaDashboardImage,
 					ImagePullPolicy: v1.PullAlways,
 					Env: []v1.EnvVar{
 						{

diff --git a/staging/staging_autogen.yaml b/staging/staging_autogen.yaml
@@ -665,7 +665,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: rancher/opni-manager:v0.1.0-rc4:latest
+        image: joekralicky/opni-manager:v0.1.1
         livenessProbe:
           httpGet:
             path: /healthz