135 Move XCache images to OSG Harbor where sensible (#136)

slateci · Jun 20, 2023 · ced5626 · ced5626
1 parent fdc37f4
commit ced5626
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/charts/xcache/Chart.yaml b/charts/xcache/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: xcache
 # Chart version
-version: 0.7.4
+version: 0.7.5
 description: XCache is a xrootd based caching service for k8s
 # Version of application packaged for installation
 appVersion: "5.4.0"

diff --git a/charts/xcache/templates/deployment.yaml b/charts/xcache/templates/deployment.yaml
@@ -62,8 +62,8 @@ spec:
 
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "slateci/xcache:testing"
+          imagePullPolicy: Always
           env:
           - name: XC_SPACE_HIGH_WM
             value: {{ .Values.XCacheConfig.HighWaterMark | quote }}
@@ -124,7 +124,7 @@ spec:
             mountPath: "/xcache/meta"
 
         - name: x509
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "slateci/xcache:testing"
           command: ["/usr/local/sbin/run_x509_updater.sh"]
           resources:
             requests:
@@ -140,7 +140,7 @@ spec:
             readOnly: true
 
         - name: reporter
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "slateci/xcache:testing"
           command: ["/usr/local/sbin/run_cache_reporter.sh"]
           env:
           - name: XC_RESOURCENAME
@@ -165,7 +165,7 @@ spec:
             mountPath: "/xcache/meta"
             readOnly: true
         - name: heartbeats
-          image: "{{ .Values.heartbeats.image }}:{{ .Values.heartbeats.tag }}"
+          image: "hub.opensciencegrid.org/slate/atlas-xcache-heartbeats:1.0.0"
           command: ["/usr/local/sbin/run_heartbeats.sh"]
           volumeMounts:
           - name: x509-data

diff --git a/charts/xcache/values.yaml b/charts/xcache/values.yaml
@@ -40,18 +40,8 @@ XCacheConfig:
   # This must be created BEFORE deploying XCache
   CertSecret: xcache-cert-secret
 
-image:
-  # repository: opensciencegrid/atlas-xcache
-  # tag: fresh
-  # pullPolicy: Always
-  repository: slateci/xcache
-  tag: testing
-  pullPolicy: Always
-
 heartbeats:
   frequency: 60
-  image: ivukotic/atlas-xcache-heartbeats
-  tag: latest
 
 ### SLATE-START ###
 SLATE: