Unique pull secrets

gimlet-io · Mar 25, 2024 · 250003f · 250003f
1 parent b45de7a
commit 250003f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/pkg/dashboard/worker/gitops.go b/pkg/dashboard/worker/gitops.go
@@ -1269,12 +1269,11 @@ func imagepullSecretTemplate(
 		encryptedConfigString = encryptedConfig.(string)
 	}
 
-	secretName := fmt.Sprintf("%s-pullsecret", strings.ToLower(registryString))
 	return sync.GenerateImagePullSecret(
 		manifest.Env,
 		manifest.App,
 		manifest.Namespace,
-		secretName,
+		strings.ToLower(registryString),
 		encryptedConfigString,
 		repoPerEnv,
 	)

diff --git a/pkg/gitops/sync/sync.go b/pkg/gitops/sync/sync.go
@@ -264,7 +264,7 @@ func GenerateKustomizationForApp(
 }
 
 func GenerateImagePullSecret(
-	env, app, namespace, name string,
+	env, app, namespace, registry string,
 	encryptedDockerconfigjson string,
 	singleEnv bool,
 ) (*manifestgen.Manifest, error) {
@@ -273,13 +273,14 @@ func GenerateImagePullSecret(
 		secretPath = app
 	}
 
+	secretName := fmt.Sprintf("%s-%s-pullsecret", app, registry)
 	secret := ssv1alpha1.SealedSecret{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "SealedSecret",
 			APIVersion: "bitnami.com/v1alpha1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
+			Name:      secretName,
 			Namespace: namespace,
 			Annotations: map[string]string{
 				"sealedsecrets.bitnami.com/cluster-wide": "true",

diff --git a/web/dashboard/src/views/envConfig/envConfig.jsx b/web/dashboard/src/views/envConfig/envConfig.jsx
@@ -551,7 +551,13 @@ class EnvConfig extends Component {
   // };
 
   imageWidget(props) {
-    return <ImageWidget {...props} setImagePullSecret={this.setImagePullSecret} registry={filterRegistry(this.state.stackConfig, this.state.stackDefinition)} />
+    return (
+      <ImageWidget
+        {...props}
+        app={this.state.configFile.app}
+        setImagePullSecret={this.setImagePullSecret}
+        registry={filterRegistry(this.state.stackConfig, this.state.stackDefinition)}
+      />)
   }
 
   render() {

diff --git a/web/dashboard/src/views/envConfig/imageWidget.jsx b/web/dashboard/src/views/envConfig/imageWidget.jsx
@@ -61,17 +61,17 @@ class ImageWidget extends Component {
 
   selectOnChange(name) {
     return (event) => {
-      const { registry } = this.props;
+      const { registry, app } = this.props;
       const login = registry[event.target.value].login ?? "your-company"
 
       switch (event.target.value) {
         case 'dockerhubRegistry':
           this.setState({ repository: `${login}/{{ .APP }}` })
-          this.props.setImagePullSecret("dockerhubregistry-pullsecret")
+          this.props.setImagePullSecret(`${app}-dockerhubregistry-pullsecret`)
           break;
         case 'ghcrRegistry':
           this.setState({ repository: `ghcr.io/${login}/{{ .APP }}` })
-          this.props.setImagePullSecret("ghcrregistry-pullsecret")
+          this.props.setImagePullSecret(`${app}-ghcrregistry-pullsecret`)
           break;
         default:
           this.setState({ repository: "127.0.0.1:32447/{{ .APP }}" })